I really appreciate your feedback Micheal however, I'm going to stick with focusing on jelmer's feedback since he is the codebase owner.  You are welcome of course to make improvements should this get merged :)