Shouldn't here be FIXME comment to delete after all is done?