Lab 6 basically done

I forgot to commit this on thursday