MOAR REFACTOR