WIP Stuff

Fixing bugs and such from my laptop. Will fix any compile errors later.