I'd love to refactor, the code is nasty. Just rushing to get 'er done. ]:

I'll start on it now.