Started scenario2.rb, minor refactor