Keeping Modeling with Mathematics as the Focus in Authentic Tasks