Lab5 finish

branched off the lab5_fix pull request I pushed a minute ago