Changed some stuff, restructured stuff. Uh..