Added collisions, but a few bugs still