Massive changes. A lot of stuff just got put together