almost done 7/29

A lot cleaner.