Laboration 4, initial commit