Started implementing bypass buffer factory