Updated the model/route infrastructure to make it a little more automagic.