Cleaned up driver a little bit, still has null pointer