Improving models, more TODO