Rebase commit. Clean up classes to be more OO
Merge pull request #1 from fluxrad/am/exception

Rebase commit. Clean up classes to be more OO