Testing done on Baxter. We're good to merge.
Merged on baxter dev machine