Progress with model errors, not sure I like it though