remove unimplemented scenario
move mast over in two of the demos
allow templates to point to templates