Everything working and submitted for part 1