Cleaning up for push to lab

Still not completely automated…