almost done version

Feb 26, almost done