got basic collision stuff working and cleaned up a ton of stuff