Add in policykit and some comments