Parts 1/2 code & incrementally improved build system