Plastic made me merge all in the last commit, just reverting this bay window I didn't mean to touch