There's a lot of FIXME's in there, are they all meant to be there?