Change funcs to return srcs, leave them open for more data later