Updated to latest versions of mvvm, statechart, and functional extensions