Revert "wiped branch so caleb can commit new framework from googledoc"

This reverts commit d6b310acef5abb2bd9c2c70f4febf5e1dab1dd1c.