Contacts state done. Made some other changes, but holding off on finishing the configuration editing for now.