Added Part 2 (still refactoring)

This will not work.