started on collision stuff
more tidying