Broke some stuff, changed some stuff.

Still trying to get a mental picture of how this will work.