Added timer, not yet finished