work on commit, refactor out git stuffs