#420 Implement scenario method

I added a couple todos and a test case.