Failed attempt at authbundle. Rolling back to what I had before...