Reworked

+ moved store function off to separate method
+ fixed form