Corrected collision and preparing for OOP