Complete questions. Model refactor begins...