refactor sword addContact for use by edit #921