Implemented first two demo steps.