First Commit

First set of changes