more TODO's for re-factoring