Started to implement the model/entity layer