Everything compiles now

Still need to debug collisions