Added handling for collision. TODO: set up movement so collision can happen.