Code from class 2, first commit