diff --git a/MC6809/test/Board.cpp b/MC6809/test/Board.cpp
index 5bd5940..f7cd108 100644
--- a/MC6809/test/Board.cpp
+++ b/MC6809/test/Board.cpp
@@ -28,6 +28,12 @@ void Board::initialise() {
 	ACIA().Accessing.connect(std::bind(&Board::Acia_Accessing, this, std::placeholders::_1));
 	ACIA().Accessed.connect(std::bind(&Board::Acia_Accessed, this, std::placeholders::_1));
 
+	ACIA().Transmitting.connect(std::bind(&Board::Acia_Transmitting, this, std::placeholders::_1));
+	ACIA().Transmitted.connect(std::bind(&Board::Acia_Transmitted, this, std::placeholders::_1));
+
+	ACIA().Receiving.connect(std::bind(&Board::Acia_Receiving, this, std::placeholders::_1));
+	ACIA().Received.connect(std::bind(&Board::Acia_Received, this, std::placeholders::_1));
+
 	CPU().powerOn();
 	CPU().raise(CPU().NMI());
 	CPU().raise(CPU().FIRQ());
@@ -93,10 +99,24 @@ void Board::Cpu_ExecutedInstruction_Acia(EightBit::mc6809&) {
 
 void Board::Acia_Accessing(EightBit::EventArgs&) {
 	if (_kbhit()) {
-		ACIA().DATA() = _getch();
-		ACIA().fillRDR();
+		ACIA().RDR() = _getch();
+		ACIA().markReceiveStarting();
 	}
 }
 
 void Board::Acia_Accessed(EightBit::EventArgs&) {
 }
+
+void Board::Acia_Transmitting(EightBit::EventArgs&) {
+	std::cout << ACIA().TDR();
+	ACIA().markTransmitComplete();
+}
+
+void Board::Acia_Transmitted(EightBit::EventArgs&) {
+}
+
+void Board::Acia_Receiving(EightBit::EventArgs&) {
+}
+
+void Board::Acia_Received(EightBit::EventArgs&) {
+}
\ No newline at end of file
diff --git a/MC6809/test/Board.h b/MC6809/test/Board.h
index 703fc19..b337271 100644
--- a/MC6809/test/Board.h
+++ b/MC6809/test/Board.h
@@ -46,9 +46,6 @@ private:
 	EightBit::register16_t m_disassembleAt = 0x0000;
 	bool m_ignoreDisassembly = false;
 
-	uint64_t m_pollCounter = 0UL;
-	uint64_t m_pollInterval = 2000000 / 50;
-
 	void Cpu_ExecutingInstruction_Debug(EightBit::mc6809&);
 	void Cpu_ExecutedInstruction_Debug(EightBit::mc6809&);
 
@@ -64,5 +61,11 @@ private:
 	void Acia_Accessing(EightBit::EventArgs&);
 	void Acia_Accessed(EightBit::EventArgs&);
 
+	void Acia_Transmitting(EightBit::EventArgs&);
+	void Acia_Transmitted(EightBit::EventArgs&);
+
+	void Acia_Receiving(EightBit::EventArgs&);
+	void Acia_Received(EightBit::EventArgs&);
+
 	void updateAciaPins(EightBit::Chip::PinLevel rw);
 };