Puppetmaster still needs to be split into before and after