prelim merging, maybe start testing?