make currentuser return a user object and move to fs package