Authentication as a wrapper

Also removing weird/not very useful authorization stuff