Fixed conflicts, support for 0x09 real commit
TODO: Send ACK
TODO: Fix 0x10's buffer