SCRAP-4 Adding everything except for the client secret