OK, now let's see what we get with the refactroring of oauth stuff