Move View logic out of model, into presenter