WIP: Fixed compilability, driver untested.