Moved to new contacts api and tests etc. etc.

Too many commits... this needs merging so I can branch off develop again.