Added some more to my TODO list "sigh"