allot of changes to the auth module, still very rough