Changed a bunch of stuff for major overhaul