Stuff

The stuff I put aside before the move should be fine to integrate, so I'm just gonna do it.