Now uses external files, to avoid choking