yes test are broken, but i'm refactoring, prob should have done on new branch