moving data fetch into the model, adding comments