Working on git integration