@mattr- I think you're right here, it's bad to do over-design with inelegant code. I've updated the commit, please have a look.