big sloppy commit, oauth working