Combat

New shit. Updated collisions.