[KFSQA-753] Almost got this Scenario working.
[KFSQA-753] Ok, pretty sure this is done and probably ready for review.