made some progress in implementing velocity