Should this have a fixme? or is it just for documentation purposes?