Then we should look into moving all the models into a Runtime rather than having one odd ball.  Something for later.