Timer integration

Timer integrated to appropriate functions
Might have to check it's position on different devices