Initial commit for #1
Misc updates