Began refactor of scenarios