Part 2 finished commit
Part 2 actually finished commit