Finish Part 2 basics

Finish Part 2 basics