all this time spent refactoring and now it just works?!