added timer stuff
something is extremely wrong