Refactored, added velocity, added another test for tunneling