Merged with main branch - now checking in web api and OAuth2 goodness