Second commit, part 2 of project