continuing work on build system