12 dma code

Pull 12_dma_code into master