Added basic puppet stuff