Flesh out Actions, move all data handling to stores