Zach's updates

From when after I went to bed