Interim commit - broken - adding recursive reset for velocity and position calculations