Added auth, not quite complete yet