Still working on the storing