Merged with Aheward.
updating master branch with only working scenarios