First set of changes

I am almost there to click commit for the first time.