Lab 4 commit 1