Add some auth, and other stuff