authentication stuff
test
fix merge