finished prelim gdoc rip
merged dev - gdocs