See the many comments to be addressed from #1815

There's a lot of TODO make issue there, don't think those issues have been made