Partially refactored buffers to use base class--still need to hanlde buffer initialization