Add authentication, authorization, users, and prelim properties
Fix merge conflicts