Lab7 at 1.3

Halfway through, some things commented out for now so go through 1.3