Console stuff all still there, but commented out in main