Mass refactoring
More cleaning up and converting to SwingWorker