adding fixme notes