First pass at multi/bulk support