Add logic for collision, not fully working yet =/