Changed collision to work

Calculations might be integratable into controller