Organized TODOs

… now lets do some of them Sean