Looked over FIXME notes.