Create more complex structure for order of new features. Add puppet wrapper.