Auth Edited, Not complete