Updated TODO to include things I need to do on factored model