Updating to include passport authentication and a solution.