diff --git a/firmware/application/Makefile b/firmware/application/Makefile
index 60b109c9d..f317a2920 100755
--- a/firmware/application/Makefile
+++ b/firmware/application/Makefile
@@ -169,6 +169,7 @@ CPPSRC = main.cpp \
          receiver_model.cpp \
          spectrum_color_lut.cpp \
          ais_baseband.cpp \
+         app_ais.cpp \
          sd_card.cpp \
          manchester.cpp \
          ../common/utility.cpp \
diff --git a/firmware/application/app_ais.cpp b/firmware/application/app_ais.cpp
new file mode 100644
index 000000000..118323ad0
--- /dev/null
+++ b/firmware/application/app_ais.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "app_ais.hpp"
+
+#include "portapack.hpp"
+using namespace portapack;
+
+AISModel::AISModel() {
+	receiver_model.set_baseband_configuration({
+		.mode = 3,
+		.sampling_rate = 2457600,
+		.decimation_factor = 4,
+	});
+	receiver_model.set_baseband_bandwidth(1750000);
+}
+
+baseband::ais::decoded_packet AISModel::on_packet(const AISPacketMessage& message) {
+	return baseband::ais::packet_decode(message.packet.payload, message.packet.bits_received);
+}	
+
+namespace ui {
+
+void AISView::on_show() {
+	Console::on_show();
+
+	auto& message_map = context().message_map();
+	message_map.register_handler(Message::ID::AISPacket,
+		[this](Message* const p) {
+			const auto message = static_cast<const AISPacketMessage*>(p);
+			this->log(this->model.on_packet(*message));
+		}
+	);
+}
+
+void AISView::on_hide() {
+	auto& message_map = context().message_map();
+	message_map.unregister_handler(Message::ID::AISPacket);
+
+	Console::on_hide();
+}
+
+void AISView::log(const baseband::ais::decoded_packet decoded) {
+	if( decoded.first == "OK" ) {
+		writeln(decoded.second);
+	}
+}
+
+} /* namespace ui */
diff --git a/firmware/application/app_ais.hpp b/firmware/application/app_ais.hpp
index ed7f403aa..606aee873 100644
--- a/firmware/application/app_ais.hpp
+++ b/firmware/application/app_ais.hpp
@@ -22,7 +22,6 @@
 #ifndef __APP_AIS_H__
 #define __APP_AIS_H__
 
-#include "receiver_model.hpp"
 #include "ui_console.hpp"
 #include "message.hpp"
 
@@ -30,53 +29,22 @@
 
 class AISModel {
 public:
-	AISModel() {
-		receiver_model.set_baseband_configuration({
-			.mode = 3,
-			.sampling_rate = 2457600,
-			.decimation_factor = 4,
-		});
-		receiver_model.set_baseband_bandwidth(1750000);
-	}
+	AISModel();
 
-	baseband::ais::decoded_packet on_packet(const AISPacketMessage& message) {
-		return baseband::ais::packet_decode(message.packet.payload, message.packet.bits_received);
-	}	
-
-private:
+	baseband::ais::decoded_packet on_packet(const AISPacketMessage& message);
 };
 
 namespace ui {
 
 class AISView : public Console {
 public:
-	void on_show() override {
-		Console::on_show();
-
-		auto& message_map = context().message_map();
-		message_map.register_handler(Message::ID::AISPacket,
-			[this](Message* const p) {
-				const auto message = static_cast<const AISPacketMessage*>(p);
-				this->log(this->model.on_packet(*message));
-			}
-		);
-	}
-
-	void on_hide() override {
-		auto& message_map = context().message_map();
-		message_map.unregister_handler(Message::ID::AISPacket);
-
-		Console::on_hide();
-	}
+	void on_show() override;
+	void on_hide() override;
 
 private:
 	AISModel model;
 
-	void log(const baseband::ais::decoded_packet decoded) {
-		if( decoded.first == "OK" ) {
-			writeln(decoded.second);
-		}
-	}
+	void log(const baseband::ais::decoded_packet decoded);
 };
 
 } /* namespace ui */