Adding puppet stuff