First successful build after refactoring (no idea if it works).