Tightening up, adding Puppet