timing stuff, updated todo