Refactoring - draw_dynamics has been generalized and has been moved to support