Initial working version
Fixed problem with mutator flyout