I need a better commit strategy for this repo