Commit before big rejig