[jFriedensreich]

ps the refactoring it did as part of the solution was a bit verbose and had a few abstractions i knew would not be needed and asked it to remove but were solid otherwise.