Second revision didn't happen, deleting it
Working on collision code, changed some names