rework models and expand views