Clean up code, work on unit collision and interaction