Part 2

Pushed part 2 commits