More work on partners list (mostly OK)