added frix from draft. save id refs as objects.