Integrate local storage
REINTEGRATE Local_storage_selects into master