Added basic timer functionality