refactor, add timetracking, minor bug correction and install of restifiy begins