Merge pull request #1 from anharrington/master

first integration of everything with Andy's work
separated drivers to demo classes for searching, sorting