Added a few things and made a runnable class.