Added a collision box class, simplified some more stuff