Initial commit
Fix nits