Do more work on user class, etc.