Adding auth support.  Works, needs error handling