Started merging code from boat into combine.