Initial checkin
Merging from init on github