These files are nearly complete, only a few inconsistencies in coding re...

...main, as well as zone and metamark issues