Started putting the code in the Application class