Velocity penalty

This seems to be working well enough to play with in master