Cbuffer feat

@SvinSimpe Please review!