More changes, more TODO