Lab 6 Updates

1 & 2 included