Added some scenarios, still not complete