impletments authentication buts needs testing
stuff
still working auth
authentication working
fix merge conflict