That might make more sense on  the slightly longer term, however for now I think it might be best to keep this since it works. Though I agree I think having a `Model` Interface might be better.