Refactor to support excel-tracking; add Thread.interrupted