Initial commit of my modifications to the role