Added FIXME and TODO

Fixes #1096