Move the procedural builder into the "make" file.
Start work on a declaritive approach.