Added all the elements from lab 6 to begin adding on functionality for lab 7.