I think after merging I'll come through and take out these model classes, as they are no longer what we need.