Commiting before making major change to code flow