Updating code base, and adding test for localstorage and model