Move Methods into Model