WIP: Refactoring into using usernames