more TODO thoughts