More work on the Spark draft.