crappy prop placement
More crappy prop-out
Merging