Added a couple of TODOs
Separated bag store logic from executable