reduce code duplication
make/config updates - wip