switched to functor version of catMaybes