Safety commit... working on rectangular collision detection