Moved some things off EDT, added progress bar