More TODOs outlining what I want to do