Maybe the whole timer option is unneeded... should we remove everything?