Collision setup work.
Cleanup
Re-worked message system