start refactoring, somethingsbroken