started implementing collision
fixed merging conflicts