Pre merge
After getting initial measurements
Before pulling from server
Fix merge
Code to test 1_4 cases as well