Adds Portkey.
Fixed typos.
Adds OptionsStore and tests.
Merges branch 'feature/add-options-store' into develop