third commit

very close to final release