Added to 1.4, finished part 2 of assignment 1