Refactor build
Refactor. Progress...
Refactor. Progress....