Working simulation, prior to a bit of a tidy up

Change-Id: If411b0258faa6f7117f7778d478d2e918a25af92