more stuff, and more TODO