initial pass with oauth stuff
cleanup