Merge pull request #280 from alevan2/master

Committing eight files, not complete work (some are not completely encod...
These files are nearly complete, only a few inconsistencies in coding remain, as well as zone and metamark issues