Re-implimenting puppet