Added part 1 & 3 of assignment 8 (almost)