added collider... unstable
Still unstable
Corrected bug.
Added C++11 goodness.
Stable but no collisions.