Adding more model logic...