votes go through
adding Ben's changes
bens changes
cleaning up some indexes
fixed merge conflicts