Privleges starting to be added, and some misc work