Fix minor problem where exception is thrown on draw
Used dict comprehension instead of using the object
Merge branch 'master' into devchema
Implemented high level plan execution