Commit before serious refactor - safety point!