Some moves and updates to collision system

Still need to add collision polys. Right now being handled by some
rectangles.