More builds, more refactoring