Laboration 2 commit #2