@nesquena :)

@databyte will be happy to work on a refactor branch together.  :)