To me, this comment reads that you want to fix this before we launch (probably because FIXME to me means something is really broken). Is this the correct reading, or is this how we're going to move forward with this for now?