It's a start

Well it's a start but didn't quite work out he way I thought it would, of course.

I have to think about some stuff w.r.t. changing the code over, especially for things that get set on the command line and things that are repository related.

My next approach will probably be to focus on one _legacy method and eliminate it as well as the related code. I'll see how that approach works.