first substantial upload, v.0.2
apparently requires merge