added observables, total overtime is now saved and summed #1 , some refactoring