Add Angus Mackenzie
Change Angus Mackenzie to use existing classes
Remove extra imports from Angus Mackenzie
Merge pull request #517 from shieldal/angus-mackenzie

Add Angus Mackenzie