I was going to move the USER-ISH methods to all/account.rb but didn't want conflicts with all your branches.  Have you been working in this area?  Should I hold up on this?