refactor, to remove JTS & Friday's early experiments