Preliminary build / merge of beamline system