WIP: Added Driver and Settings objects to clean up API