More updates to the structure. Getting ready to display data for
individual users.