Cleaned up a bit and made room for the Planning View to talk to the actual model.