oAuth support
merged changes
put serializer back in