Move TODOs to #212 Wish list