New TODO items

Starting on what we discussed yesterday.