New Files,  updated. Switched from JavaFX to Swing