Added Archetype and XO and converted the login process to use them!