Commit before refactor
Lay new foundation