lots of changes to finish up migration from Lists to Streams