Working on better contact storage