Initial commit
Merging cleanup