Lab2b First Pass

Missed a couple, going  back to take a look