basic authorization working
fixed merge conflicts