Code from this point onwards has code changes as per post-mtg-101514-feedback-R2. See hand written notes for details