initial commit
Merging some conflicts from initial commit