bleh

wow such refactor much bad