merging work getting ready to redo tool chain