Fixing my blocker bug in time for the demo