The user stuff should be in a separate commit