Lots more progress on the binding generator