Revert "Major update:"

This reverts commit 214806d2063ff8da175c0365937cebd72ce227ee.
Updated from previous commit, but w/ indexes