ready to run, though need to tweak time wrapper