PARTIAL: All but batch get passing unit tests.