WIP: Initial collision handling is working sort of