Split out the store and model stuff