refactored!  but probably broke some shit.  f-it, it's clean, and i am happy