First round of changes

Lots more to come, need to write the whole puppet section yet.... ;)