Timer and time tracking added