Added basic collisions, updating