add FIXMEs to esoo