Get plenty of things ready for auth

This time it's for real!