Got the setup looking good for the demo. Had to hardcode some values in though.
Merge