Updated, uses localstorage and removed old stuff