TODO's enumerated
Added a few TODO's to help track what's still needed.