Curdev
Working version
Added legacy API code
No more buffer piping
Taking null buffers in count