Added basic person/pair functionality