Finish part 1 of demo scenario