WIP - no more need for these scritps. Puppet takes control