re-add the epoch stuff

this is required until the new time step handling code lands...