Good news is, there is test coverage.

I need some feedback on above questions to proceed in a reasonable direction ... or feel free to send code ...