diff --git a/Zotlabs/Module/Oauth2test.php b/Zotlabs/Module/Oauth2test.php
new file mode 100644
index 000000000..14aa6137a
--- /dev/null
+++ b/Zotlabs/Module/Oauth2test.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Zotlabs\Module;
+
+class Oauth2test extends \Zotlabs\Web\Controller {
+
+	function get() {
+
+		$o .= replace_macros(get_markup_template('oauth2test.tpl'), array(
+			'$baseurl' => z_root(),
+			'$endpoints' => array(
+				array(
+					'oauth2test',
+					array(
+						array(
+							'action', 'create_db'
+						)
+					),
+					'oauth2test_create_db',
+					'Create the OAuth2 database tables'
+				)
+			)
+		));
+
+		return $o;
+	}
+
+	function post() {
+		
+		logger(json_encode($_POST), LOGGER_DEBUG);
+		
+		switch ($_POST['action']) {
+			case 'create_db':
+				logger('Creating database tables...', LOGGER_DEBUG);
+				break;
+
+			default:
+				break;
+		}
+		
+	}
+
+}
diff --git a/view/css/mod_oauth2test.css b/view/css/mod_oauth2test.css
new file mode 100644
index 000000000..0ef2896b5
--- /dev/null
+++ b/view/css/mod_oauth2test.css
@@ -0,0 +1,4 @@
+.oath2test-form-box {
+	border: #ccc thin solid;
+	padding: 1em;
+}
\ No newline at end of file
diff --git a/view/tpl/oauth2test.tpl b/view/tpl/oauth2test.tpl
new file mode 100644
index 000000000..d4887063c
--- /dev/null
+++ b/view/tpl/oauth2test.tpl
@@ -0,0 +1,13 @@
+<h1>OAuth 2.0 Test Vehicle</h1>
+
+{{foreach $endpoints as $ept}}
+<div class="oath2test-form-box">
+<form action="{{$baseurl}}/{{$ept.0}}" method="post">
+	<h3>{{$ept.3}}</h3>
+	<p>{{$baseurl}}/{{$ept.0}}/?{{foreach $ept.1 as $field}}{{$field.0}}={{$field.1}}&<input type="hidden" name="{{$field.0}}" value="{{$field.1}}" />	{{/foreach}}
+	</p>
+	<button type="submit" name="{{$ept.2}}_submit" value="submit" class="btn btn-med" title="">Submit</button>
+	
+</form>
+	</div>
+{{/foreach}}
\ No newline at end of file