Move some rejoiceable logic into model 2