Added 'OOP' Hierarchy, Collision Detection