More work on editing/iql