Wip hiera rewrite

Change-Id: I3954386f7a3f143642483cd86dfb2bf88313555c