pulling in Carsons changes
Carsons changes to cluster
rename
Carsons changes
Adding template for root user