tweaking and refactoring before a big push to pump out data...