Tools user list rebase

Rebased version of #224 so I can work on wiring up missing interactions