Move things around to prep for crafty-fication
Update to use crafty! Sorta!