and its working \o/

store all and take all buttons now work as intended