Added rudimentary timer