Major Commit, added mac control module