localstorage stuff seems to work
merge'd