Modeling work to allow us to run against a fictional cluster
Model updates - now viable for running and end to end test