- continue refactoring users