Added Local Storage

Still a few bugs