Feature/oauth

This looks like a bug