Added more functionality - now we can track the time :)