Continuing to fix the models. Slowly getting something minimally stable.