Fixed some todo's - get number contacts in (0), shdx needs work