Cleaned up code, moved lots of functionality into Driver