First shot at updating the models in order