Commit before major code rework