Some work on the output model, more remain to be done.