Fixing misc todo's
Porting group cache & resolving misc todo's