Adding auth + minor refactor + vcr tests