Fixme and Change macros
Small progress