Fix uses of vote store, add term storage
Fix up transitions for setting term and store
Merge branch 'feature-add-term-store-interface'