Added some fixme notes for the future