Hunter branch

merging driver class into master for clarity.