added basic stuff from lab 6