Improve info and add TODO. More to come on that.