More collision stuff

I need to sit on this for now, I want to make it work without adding
anything else to the base game object, i just need to figure it out in
as an epiphany.  Works mostly though.