New Collision System

Change in progress...
Fix
Fixed Cakefile