Added most of Part 1 of lab 2