Added code to track current user.  Updated models.