Models done, refactored to avoid code duplication (dry)