Adding stuff for labs 5-8