fixup! started big refactoring