Feature/backpor holodeck pr23

Backporting https://github.com/shaunsephton/holodeck/pull/23 to your port.
This has PR #1 and #3 in it, once those land this'll only be a single commit that needs merging in.