Pretty much finished part 2