New version

for discussion - submodules will need updaing when the continuent-puppet has been pulled in