Interim commit
Completed major objectives and code refactoring
Completed major objectives and code refactoring
Merged mac_classification changes into master