using Stream's rather than a List but not sure if it will matter. Test is running now.