Driver Re-write Updates

Missed some staged changes in my previous commit DOH!