Add Contact class, more stuff