Refactored tile collision - still work to do but a lot better shape.