trying to refactor all the things...
commit before new branch