Update 7

Submitted again. This runs and does most tests right. Got rid of the
"this" statements and fixed the class and some other declarations.