- Initial code for device buffer
- Fix conflicts