Updated the main class to be more static.