Add FIXME and OPTIMIZE