Added FIXMEs as questions