Storing works, but needs a revamp
working on a fix