Ok, about to start the reorganization of the trainers:  Will introduce a step trainer class.  Will rename it later...  Also want to put a tag on this commit.