Some work on velocity stuff, not yet working