added basic collision detection and movement along currents.