Working on fixing Authorization issue, this is a commit before adding third party code