diff --git a/Makefile.am b/Makefile.am
index fd89dff..46cde9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,7 +178,9 @@ nrm_papiwrapper_LDADD = libnrm.la
 if HAVE_GEOPM
 nrm_geopm_SOURCES = src/binaries/nrm-geopm.c
 nrm_geopm_LDADD = libnrm.la
-bin_PROGRAMS += nrm-geopm
+nrm_geopm_batch_SOURCES = src/binaries/nrm-geopm-batch.c
+nrm_geopm_batch_LDADD = libnrm.la
+bin_PROGRAMS += nrm-geopm nrm-geopm-batch
 endif
 
 bin_SCRIPTS = nrm-setup nrm-prometheus
diff --git a/src/binaries/nrm-geopm-batch.c b/src/binaries/nrm-geopm-batch.c
new file mode 100644
index 0000000..ae2b9e5
--- /dev/null
+++ b/src/binaries/nrm-geopm-batch.c
@@ -0,0 +1,369 @@
+/*******************************************************************************
+ * Copyright 2019 UChicago Argonne, LLC.
+ * (c.f. AUTHORS, LICENSE)
+ *
+ * This file is part of the libnrm project.
+ * For more info, see https://github.com/anlsys/libnrm
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *******************************************************************************/
+
+/* Filename: nrm-geopm.c
+ *
+ * Description: Implements middleware between GEOPM (https://geopm.github.io/)
+ * and the NRM downstream interface. Resources detected via GEOPM. The
+ * `geopmd` service must be running. The `msr` module must be enabled via
+ * `modprobe msr` if its installed. This utility may also need root privileges
+ * to detect many basic signals like CPU_POWER.
+ */
+
+#include "nrm.h"
+#include "nrm/tools.h"
+#include <assert.h>
+#include <errno.h>
+#include <geopm_pio.h>
+#include <geopm_topo.h>
+#include <getopt.h>
+#include <limits.h>
+#include <math.h>
+#include <pthread.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
+
+static nrm_client_t *client;
+static nrm_vector_t *events;
+static nrm_actuator_t *actuator;
+static nrm_vector_t *controls;
+static size_t num_events;
+static pthread_mutex_t geopm_lock;
+
+/* 16 values is enough */
+#define GEOPM_ACTUATOR_CHOICES 16
+
+struct nrm_geopm_eventinfo_s {
+	nrm_string_t name;
+	int domain_type;
+	int num_domains;
+	nrm_vector_t *pio_ids;
+	nrm_sensor_t *sensor;
+	nrm_vector_t *scopes;
+};
+
+typedef struct nrm_geopm_eventinfo_s nrm_geopm_eventinfo_t;
+
+int nrm_geopm_cpu_act_callback(nrm_uuid_t *uuid, double value)
+{
+	(void)uuid;
+	int err = 0;
+	int num_pus = geopm_topo_num_domain(GEOPM_DOMAIN_PACKAGE);
+	nrm_log_debug(
+	        "Writing CPU_POWER_LIMIT_CONTROL to %d domains. Value: %f\n",
+	        num_pus, value);
+	pthread_mutex_lock(&geopm_lock);
+	for (int i = 0; i < num_pus; i++) {
+		int *pio_id;
+		nrm_vector_get_withtype(int, controls, i, pio_id);
+		err = geopm_pio_adjust(*pio_id, value);
+		if (err) {
+			nrm_log_error("Adjusting batch %d:%d\n", i, *pio_id);
+			goto error;
+		}
+	}
+	geopm_pio_write_batch();
+error:
+	pthread_mutex_unlock(&geopm_lock);
+	return err;
+}
+
+int nrm_geopm_domain_to_scope(nrm_scope_t *scope,
+                              int domain_type,
+                              int domain_idx)
+{
+	if (domain_type == GEOPM_DOMAIN_PACKAGE) {
+		/* GEOPM uses it's own internal numbering, so ask it to convert
+		 * to OS indexes
+		 */
+		int num_pus = geopm_topo_num_domain_nested(
+		        GEOPM_DOMAIN_CPU, GEOPM_DOMAIN_PACKAGE);
+		int pus[num_pus];
+		geopm_topo_domain_nested(GEOPM_DOMAIN_CPU, GEOPM_DOMAIN_PACKAGE,
+		                         domain_idx, num_pus, pus);
+
+		for (int i = 0; i < num_pus; i++) {
+			nrm_scope_add(scope, NRM_SCOPE_TYPE_CPU, pus[i]);
+		}
+	} else if (domain_type == GEOPM_DOMAIN_GPU) {
+		nrm_scope_add(scope, NRM_SCOPE_TYPE_GPU, domain_idx);
+	}
+	return 0;
+}
+
+int nrm_geopm_find_scope(nrm_scope_t **scope, int *added)
+{
+	nrm_vector_t *nrmd_scopes;
+	int newscope = 0;
+	size_t numscopes;
+	nrm_client_list_scopes(client, &nrmd_scopes);
+	nrm_vector_length(nrmd_scopes, &numscopes);
+	for (size_t i = 0; i < numscopes; i++) {
+		nrm_scope_t *s;
+		nrm_vector_pop_back(nrmd_scopes, &s);
+		if (!nrm_scope_cmp(s, *scope)) {
+			nrm_scope_destroy(*scope);
+			*scope = s;
+			newscope = 1;
+			continue;
+		}
+		nrm_scope_destroy(s);
+	}
+	if (!newscope) {
+		nrm_log_debug(
+		        "allowed scope not found in nrmd, adding a new one\n");
+	}
+	nrm_vector_destroy(&nrmd_scopes);
+	*added = !newscope;
+	return 0;
+}
+
+void nrm_geopm_prepare_event(nrm_string_t *s)
+{
+	int err;
+	nrm_geopm_eventinfo_t event;
+	event.name = *s;
+	nrm_string_incref(event.name);
+
+	/* geopm info */
+	event.domain_type = geopm_pio_signal_domain_type(event.name);
+	nrm_log_debug("Parsed %s as domain type %d\n", event.name,
+	              event.domain_type);
+	assert(event.domain_type > 0);
+	event.num_domains = geopm_topo_num_domain(event.domain_type);
+	nrm_log_debug("Domain type %d as %d domains\n", event.domain_type,
+	              event.num_domains);
+	assert(event.num_domains > 0);
+
+	char domain_name[NAME_MAX + 1];
+	err = geopm_topo_domain_name(event.domain_type, NAME_MAX, domain_name);
+	assert(err == 0);
+	nrm_log_debug("Parsed %s as domain %s\n", event.name, domain_name);
+
+	/* sensor info */
+	nrm_string_t sensor_name =
+	        nrm_string_fromprintf("nrm.geopm.%s", event.name);
+	event.sensor = nrm_sensor_create(sensor_name);
+	nrm_client_add_sensor(client, event.sensor);
+
+	/* scope info */
+	nrm_vector_create(&event.pio_ids, sizeof(int));
+	nrm_vector_create(&event.scopes, sizeof(nrm_scope_t *));
+	for (int i = 0; i < event.num_domains; i++) {
+		nrm_string_t scope_name = nrm_string_fromprintf(
+		        "nrm.geopm.%s.%s.%d", event.name, domain_name, i);
+		int added_scope;
+		nrm_scope_t *scope = nrm_scope_create(scope_name);
+		nrm_geopm_domain_to_scope(scope, event.domain_type, i);
+		nrm_geopm_find_scope(&scope, &added_scope);
+		nrm_vector_push_back(event.scopes, &scope);
+		int pio_id = geopm_pio_push_signal(event.name, event.domain_type, i);
+		nrm_vector_push_back(event.pio_ids, &pio_id);
+	}
+	nrm_vector_push_back(events, &event);
+	nrm_log_debug("Created sensor %s from event %s\n", event.sensor->uuid,
+	              event.name);
+}
+
+void nrm_geopm_prepare_cpu_actuator()
+{
+	/* we use the default as max because the max is often way too high */
+	char *cpu_power_max_name = "CPU_POWER_LIMIT_DEFAULT";
+	char *cpu_power_min_name = "CPU_POWER_MIN_AVAIL";
+
+	double cpu_power_max, cpu_power_min;
+
+	/* use package 0 for configuration */
+	geopm_pio_read_signal(cpu_power_max_name, GEOPM_DOMAIN_PACKAGE, 0,
+	                      &cpu_power_max);
+	geopm_pio_read_signal(cpu_power_min_name, GEOPM_DOMAIN_PACKAGE, 0,
+	                      &cpu_power_min);
+	nrm_log_debug("CPU power actuator: min: %f, max: %f\n", cpu_power_min,
+	              cpu_power_max);
+
+	double act_choices[GEOPM_ACTUATOR_CHOICES];
+	for (size_t i = 0; i < GEOPM_ACTUATOR_CHOICES - 1; i++) {
+		act_choices[i] =
+		        cpu_power_min + (int)((cpu_power_max - cpu_power_min) *
+		                              i / (GEOPM_ACTUATOR_CHOICES - 1));
+	}
+	/* force the last one to be at max, regardless of rounding errors */
+	act_choices[GEOPM_ACTUATOR_CHOICES - 1] = cpu_power_max;
+
+	nrm_actuator_set_choices(actuator, GEOPM_ACTUATOR_CHOICES, act_choices);
+	nrm_actuator_set_value(actuator, cpu_power_max);
+	
+	int num_pus = geopm_topo_num_domain(GEOPM_DOMAIN_PACKAGE);
+	nrm_vector_create(&controls, sizeof(int));
+	for (int i = 0; i < num_pus; i++) {
+		int pio_id = geopm_pio_push_control("CPU_POWER_LIMIT_CONTROL",
+						    GEOPM_DOMAIN_PACKAGE, i);
+		nrm_vector_push_back(controls, &pio_id);
+	}
+}
+
+int nrm_geopm_timer_callback(nrm_reactor_t *reactor)
+{
+	(void)reactor;
+	nrm_time_t time;
+	nrm_time_gettime(&time);
+	geopm_pio_read_batch();
+	nrm_vector_foreach(events, iterator)
+	{
+		nrm_geopm_eventinfo_t *event =
+		        nrm_vector_iterator_get(iterator);
+		pthread_mutex_lock(&geopm_lock);
+		for (int i = 0; i < event->num_domains; i++) {
+			double value = 0.0;
+			nrm_scope_t **s;
+			int *pio_id;
+			nrm_vector_get_withtype(nrm_scope_t *, event->scopes, i,
+			                        s);
+			nrm_vector_get_withtype(int, event->pio_ids, i, pio_id);
+			geopm_pio_sample(*pio_id, &value);
+			nrm_log_debug("%s.%d - energy measurement: %f\n",
+			              event->name, i, value);
+			nrm_client_send_event(client, time, event->sensor, *s,
+			                      value);
+		}
+		pthread_mutex_unlock(&geopm_lock);
+	}
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	int err;
+	nrm_tools_args_t args;
+
+	nrm_init(NULL, NULL);
+	assert(nrm_log_init(stderr, "nrm-geopm") == 0);
+
+	int ret = EXIT_FAILURE;
+
+	args.progname = "nrm-geopm";
+	args.flags = NRM_TOOLS_ARGS_FLAG_FREQ | NRM_TOOLS_ARGS_FLAG_EVENT;
+
+	err = nrm_tools_parse_args(argc, argv, &args);
+	if (err < 0) {
+		nrm_log_error("errors during argument parsing\n");
+		nrm_tools_print_help(&args);
+		exit(EXIT_FAILURE);
+	}
+
+	if (args.ask_help) {
+		nrm_tools_print_help(&args);
+		exit(EXIT_SUCCESS);
+	}
+	if (args.ask_version) {
+		nrm_tools_print_version(&args);
+		exit(EXIT_SUCCESS);
+	}
+
+	nrm_log_setlevel(args.log_level);
+
+	nrm_vector_length(args.events, &num_events);
+	if (num_events == 0) {
+		nrm_string_t s = nrm_string_fromchar("CPU_FREQUENCY_STATUS");
+		nrm_vector_push_back(args.events, &s);
+		nrm_log_debug("Measuring CPU_FREQUENCY_STATUS by default\n");
+	}
+
+	if (nrm_client_create(&client, args.upstream_uri, args.pub_port,
+	                      args.rpc_port) != 0 ||
+	    client == NULL) {
+		nrm_log_error("Client creation failed\n");
+		goto cleanup_postinit;
+	}
+
+	nrm_log_debug("NRM client initialized.\n");
+	nrm_log_debug("Events:\n");
+	nrm_vector_foreach(args.events, iterator)
+	{
+		nrm_string_t *s = nrm_vector_iterator_get(iterator);
+		nrm_log_debug("%s\n", *s);
+	}
+
+	int nsignals = geopm_pio_num_signal_name();
+	assert(nsignals > 0); // just check that we can obtain signals
+	nrm_log_debug("GEOPM detects %d possible signals\n", nsignals);
+
+	pthread_mutex_init(&geopm_lock, NULL);
+
+	nrm_vector_create(&events, sizeof(nrm_geopm_eventinfo_t));
+	nrm_vector_foreach(args.events, iterator)
+	{
+		nrm_string_t *s = nrm_vector_iterator_get(iterator);
+		nrm_geopm_prepare_event(s);
+	}
+
+	actuator = nrm_actuator_create("nrm.geopm.cpu.power");
+	nrm_geopm_prepare_cpu_actuator();
+	err = nrm_client_add_actuator(client, actuator);
+	if (err) {
+		nrm_log_error("Unable to add cpu actuator to client\n");
+		goto cleanup_act;
+	}
+	nrm_log_debug("Actuator added to client\n");
+	nrm_client_set_actuate_listener(client, nrm_geopm_cpu_act_callback);
+	nrm_log_debug("Actuator callback set to client\n");
+	nrm_client_start_actuate_listener(client);
+	nrm_log_debug("Actuator callback started\n");
+
+	nrm_reactor_t *reactor;
+	err = nrm_reactor_create(&reactor, NULL);
+	if (err) {
+		nrm_log_error("error during reactor creation\n");
+		goto cleanup;
+	}
+
+	nrm_reactor_user_callbacks_t callbacks = {
+	        .signal = NULL,
+	        .timer = nrm_geopm_timer_callback,
+	};
+	nrm_reactor_setcallbacks(reactor, callbacks);
+	nrm_time_t sleeptime = nrm_time_fromfreq(args.freq);
+	nrm_reactor_settimer(reactor, sleeptime);
+	nrm_reactor_start(reactor);
+	ret = EXIT_SUCCESS;
+
+	nrm_reactor_destroy(&reactor);
+cleanup:
+	nrm_client_remove_actuator(client, actuator);
+cleanup_act:
+	nrm_actuator_destroy(&actuator);
+	nrm_vector_foreach(events, iterator)
+	{
+		nrm_geopm_eventinfo_t *e = nrm_vector_iterator_get(iterator);
+		nrm_client_remove_sensor(client, e->sensor);
+		nrm_sensor_destroy(&e->sensor);
+		for (int i = 0; i < e->num_domains; i++) {
+			nrm_scope_t **s;
+			nrm_vector_get_withtype(nrm_scope_t *, e->scopes, i, s);
+			nrm_scope_destroy(*s);
+		}
+	}
+	nrm_vector_destroy(&events);
+	nrm_client_destroy(&client);
+	pthread_mutex_destroy(&geopm_lock);
+cleanup_postinit:
+	nrm_tools_args_destroy(&args);
+	nrm_finalize();
+	return ret;
+}