Restructuring of the code. They have passed the data functions to the
model.