Add pick and store functions, validation