Worked on memory leaks, back to MAC to work on ring buffer