Lots of changes integrating PDO driver. Still a work in progress.