new version
finished second version - sending to josh
merged