dirty mess of things - validator not working, prob need to refactor store method commands into one