Fix up the access token secret stuff.
Clean up the steps fetching code and get ready for adding more data
types.