Added authentication, still working on authorization