stuff todo on model classes