Work on collision added in (Still far from done)