implemented collision detection, started work on barrels