WIP. Refactoring in progress.
Trying to get hiera working