Finished moving things around in main method