well, that's not going as easily as it might... time for the REFACTORINATOR