Basic interaction implemented
resolved merge conflicts
update test map, to have collidable objects