Add timed tasks as per IRC request - please test