toplevel build system continued