lots more TODO's
lot more timer related TODO's