Added the scenarios for stories 2 and 4 (fixes #22 & #23).