moved oauth into the wrapper
Template updates