Add testing environment
Better batchFormatter

Now can take updates AND new entries