Added proper storing, works (for the first time)