added git and better timing support along with some refactorizaiton