Added everything for part 8!