minor refactoring
WIP: trying to make user lists working