Refactored code, now able to get at least the current user.