Oops, some merge issues there
Cleaned up ModelOrResult a bit