Finished dynamics - need some polishing