fixing stupid design decisions and moving the driver class out of commands