diff --git a/ESP32/comm_esp32_hardwareserial.cpp b/ESP32/comm_esp32_hardwareserial.cpp
new file mode 100644
index 0000000..c82dac0
--- /dev/null
+++ b/ESP32/comm_esp32_hardwareserial.cpp
@@ -0,0 +1,61 @@
+#include "gen.h"
+
+#if defined(ESP32)
+#include <driver/uart.h>
+
+#include "comm_esp32_hardwareserial.h"
+
+
+comm_esp32_hardwareserial::comm_esp32_hardwareserial(const int uart_nr, const int rx_pin, const int tx_pin, const int bitrate) : uart_nr(uart_nr)
+{
+	// Configure UART parameters
+	static uart_config_t uart_config = {
+		.baud_rate = bitrate,
+		.data_bits = UART_DATA_8_BITS,
+		.parity    = UART_PARITY_DISABLE,
+		.stop_bits = UART_STOP_BITS_1,
+		.flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
+		.rx_flow_ctrl_thresh = 122,
+	};
+	ESP_ERROR_CHECK(uart_param_config(uart_nr, &uart_config));
+
+	ESP_ERROR_CHECK(uart_set_pin(uart_nr, tx_pin, rx_pin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE));
+
+	// Setup UART buffered IO with event queue
+	const int uart_buffer_size = 1024 * 2;
+	static QueueHandle_t uart_queue;
+	// Install UART driver using an event queue here
+	ESP_ERROR_CHECK(uart_driver_install(uart_nr, uart_buffer_size, uart_buffer_size, 10, &uart_queue, 0));
+}
+
+comm_esp32_hardwareserial::~comm_esp32_hardwareserial()
+{
+	ESP_ERROR_CHECK(uart_driver_delete(uart_nr));
+}
+
+bool comm_esp32_hardwareserial::is_connected()
+{
+	return true;
+}
+
+bool comm_esp32_hardwareserial::has_data()
+{
+	size_t n_available = 0;
+	ESP_ERROR_CHECK(uart_get_buffered_data_len(uart_nr, &n_available));
+
+	return n_available > 0;
+}
+
+uint8_t comm_esp32_hardwareserial::get_byte()
+{
+	uint8_t c = 0;
+	uart_read_bytes(uart_nr, &c, 1, 100);  // error checking?
+
+	return c;
+}
+
+void comm_esp32_hardwareserial::send_data(const uint8_t *const in, const size_t n)
+{
+	uart_write_bytes(uart_nr, in, n);  // error checking?
+}
+#endif
diff --git a/ESP32/comm_esp32_hardwareserial.h b/ESP32/comm_esp32_hardwareserial.h
new file mode 100644
index 0000000..10d6699
--- /dev/null
+++ b/ESP32/comm_esp32_hardwareserial.h
@@ -0,0 +1,19 @@
+#include "comm.h"
+
+
+class comm_esp32_hardwareserial: public comm
+{
+private:
+	const int uart_nr { 1};
+
+public:
+	comm_esp32_hardwareserial(const int uart_nr, const int rx_pin, const int tx_pin, const int bps);
+	virtual ~comm_esp32_hardwareserial();
+
+	bool    is_connected() override;
+
+	bool    has_data() override;
+	uint8_t get_byte() override;
+
+	void    send_data(const uint8_t *const in, const size_t n) override;
+};