changed a bunch so that the step happens in the Tracpy class