Jcm/puppet overhaul