About to remove all "demo" string references.
Removed all references to previous class names.
Additional output renamings for consistancy.
Major rewrite, moving to "Semantic Action" model. Not working yet, but close!