Decided to remove the old wip/Problem model. The simpler one wins.