Add @TODOs and @FIXMEs

#2 

#### Changes
* No code changes, only comments