Completed add MAC functionality, started writing remove MAC functionality