Revert "Revert "Revert "move steves shit around"""

This reverts commit e789b171588ce1686f5b8659e481a9d19d5420bc.
for reals