added a timer and some other shite