Adding TODOs and FIXMEs