diff --git a/includes/class-activitypub.php b/includes/class-activitypub.php
index 86da12f..ba73d05 100644
--- a/includes/class-activitypub.php
+++ b/includes/class-activitypub.php
@@ -1,12 +1,16 @@
 <?php
 
 class Activitypub {
-	public static function render_profile( $template ) {
-		if ( ! is_author() ) {
+	public static function render_json_template( $template ) {
+		if ( ! is_author() && ! is_singular() ) {
 			return $template;
 		}
 
-		$json_template = dirname( __FILE__ ) . '/../templates/profile.php';
+		if ( is_author() ) {
+			$json_template = dirname( __FILE__ ) . '/../templates/json-author.php';
+		} elseif ( is_singular() ) {
+			$json_template = dirname( __FILE__ ) . '/../templates/json-post.php';
+		}
 
 		global $wp_query;
 
@@ -70,6 +74,6 @@ class Activitypub {
 	 * Add our rewrite endpoint to permalinks and pages.
 	 */
 	public static function add_rewrite_endpoint() {
-		add_rewrite_endpoint( 'activitypub', EP_AUTHORS );
+		add_rewrite_endpoint( 'activitypub', EP_AUTHORS | EP_PERMALINK | EP_PAGES );
 	}
 }
diff --git a/templates/json-author.php b/templates/json-author.php
new file mode 100644
index 0000000..5e174c2
--- /dev/null
+++ b/templates/json-author.php
@@ -0,0 +1,107 @@
+<?php
+$author_id = get_the_author_meta( 'ID' );
+
+$json = new stdClass();
+
+$json->{'@context'} = array(
+	'https://www.w3.org/ns/activitystreams',
+	'https://w3id.org/security/v1',
+	array(
+		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
+		'sensitive' => 'as:sensitive',
+		'movedTo' => array(
+			'@id' => 'as:movedTo',
+			'@type' => '@id',
+		),
+		'Hashtag' => 'as:Hashtag',
+		'ostatus' => 'http://ostatus.org#',
+		'atomUri' => 'ostatus:atomUri',
+		'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri',
+		'conversation' => 'ostatus:conversation',
+		'toot' => 'http://joinmastodon.org/ns#',
+		'Emoji' => 'toot:Emoji',
+		'focalPoint' => array(
+			'@container' => '@list',
+			'@id' => 'toot:focalPoint',
+		),
+		'featured' => array(
+			'@id' => 'toot:featured',
+			'@type' => '@id',
+		),
+		'schema' => 'http://schema.org#',
+		'PropertyValue' => 'schema:PropertyValue',
+		'value' => 'schema:value',
+	),
+);
+
+$json->id = get_author_posts_url( $author_id );
+$json->type = 'Person';
+$json->name = get_the_author_meta( 'display_name', $author_id );
+$json->summary = wp_strip_all_tags( get_the_author_meta( 'description', $author_id ) );
+$json->preferredUsername = get_the_author_meta( 'login', $author_id ); // phpcs:ignore
+$json->url = get_author_posts_url( $author_id );
+$json->icon = array(
+	'type' => 'Image',
+	'url'  => get_avatar_url( $author_id, array( 'size' => 120 ) ),
+);
+
+if ( has_header_image() ) {
+	$json->image = array(
+		'type' => 'Image',
+		'url'  => get_header_image(),
+	);
+} else {
+	$json->image = array();
+}
+
+$json->inbox = get_rest_url( null, "/activitypub/1.0/users/$author_id/inbox" );
+$json->outbox = get_rest_url( null, "/activitypub/1.0/users/$author_id/outbox" );
+//$json->following = get_rest_url( null, "/activitypub/1.0/users/$author_id/following" );
+//$json->followers = get_rest_url( null, "/activitypub/1.0/users/$author_id/followers" );
+//$json->featured  = get_rest_url( null, "/activitypub/1.0/users/$author_id/featured" );
+
+//$json->manuallyApprovesFollowers = apply_filters( 'activitypub_manually_approves_followers', __return_false() ); // phpcs:ignore
+
+if ( method_exists( 'Magic_Sig', 'get_public_key' ) ) {
+	// phpcs:ignore
+	$json->publicKey = array(
+		'id' => get_author_posts_url( $author_id ) . '#main-key',
+		'owner' => get_author_posts_url( $author_id ),
+		'publicKeyPem' => trim( Magic_Sig::get_public_key( $author_id ) ),
+	);
+}
+
+$json->tag = array();
+$json->attachment = array();
+//$json->endpoints = array(
+//	'sharedInbox' => get_rest_url( null, '/activitypub/1.0/inbox' ),
+//);
+
+// filter output
+$json = apply_filters( 'activitypub_json_author_array', $json );
+
+/*
+ * Action triggerd prior to the ActivityPub profile being created and sent to the client
+ */
+do_action( 'activitypub_json_author_pre' );
+
+$options = 0;
+// JSON_PRETTY_PRINT added in PHP 5.4
+if ( get_query_var( 'pretty' ) ) {
+	$options |= JSON_PRETTY_PRINT; // phpcs:ignore
+}
+
+/*
+ * Options to be passed to json_encode()
+ *
+ * @param int $options The current options flags
+ */
+$options = apply_filters( 'activitypub_json_author_options', $options );
+
+header( 'Content-Type: application/activity+json' );
+echo wp_json_encode( $json, $options );
+
+/*
+ * Action triggerd after the ActivityPub profile has been created and sent to the client
+ */
+do_action( 'activitypub_json_author_post' );
diff --git a/templates/json-post.php b/templates/json-post.php
new file mode 100644
index 0000000..43f17c0
--- /dev/null
+++ b/templates/json-post.php
@@ -0,0 +1,66 @@
+<?php
+$post = get_post();
+
+$json = new stdClass();
+
+$json->{'@context'} = array(
+	'https://www.w3.org/ns/activitystreams',
+	'https://w3id.org/security/v1',
+	array(
+		'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
+		'sensitive' => 'as:sensitive',
+		'movedTo' => array(
+			'@id' => 'as:movedTo',
+			'@type' => '@id',
+		),
+		'Hashtag' => 'as:Hashtag',
+		'ostatus' => 'http://ostatus.org#',
+		'atomUri' => 'ostatus:atomUri',
+		'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri',
+		'conversation' => 'ostatus:conversation',
+		'toot' => 'http://joinmastodon.org/ns#',
+		'Emoji' => 'toot:Emoji',
+		'focalPoint' => array(
+			'@container' => '@list',
+			'@id' => 'toot:focalPoint',
+		),
+		'featured' => array(
+			'@id' => 'toot:featured',
+			'@type' => '@id',
+		),
+		'schema' => 'http://schema.org#',
+		'PropertyValue' => 'schema:PropertyValue',
+		'value' => 'schema:value',
+	),
+);
+
+$post = activitypub_post_to_json( $post, $json );
+
+// filter output
+$json = apply_filters( 'activitypub_json_post_array', $json );
+
+/*
+ * Action triggerd prior to the ActivityPub profile being created and sent to the client
+ */
+do_action( 'activitypub_json_post_pre' );
+
+$options = 0;
+// JSON_PRETTY_PRINT added in PHP 5.4
+if ( get_query_var( 'pretty' ) ) {
+	$options |= JSON_PRETTY_PRINT; // phpcs:ignore
+}
+
+/*
+ * Options to be passed to json_encode()
+ *
+ * @param int $options The current options flags
+ */
+$options = apply_filters( 'activitypub_json_post_options', $options );
+
+header( 'Content-Type: application/activity+json' );
+echo wp_json_encode( $json, $options );
+
+/*
+ * Action triggerd after the ActivityPub profile has been created and sent to the client
+ */
+do_action( 'activitypub_json_post_post' );
diff --git a/templates/profile.php b/templates/profile.php
deleted file mode 100644
index 770a076..0000000
--- a/templates/profile.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-$author_id = get_the_author_meta( 'ID' );
-
-$json = new stdClass();
-
-$json->{'@context'} = array(
-	'https://www.w3.org/ns/activitystreams',
-	'https://w3id.org/security/v1',
-);
-
-$json->id                = get_author_posts_url( $author_id );
-$json->type              = 'Person';
-$json->name              = get_the_author_meta( 'display_name', $author_id );
-$json->summary           = wp_strip_all_tags( get_the_author_meta( 'description', $author_id ) );
-$json->preferredUsername = get_the_author_meta( 'login', $author_id ); // phpcs:ignore
-$json->url               = get_author_posts_url( $author_id );
-$json->icon              = array(
-	'type' => 'Image',
-	'url'  => get_avatar_url( $author_id, array( 'size' => 120 ) ),
-);
-
-if ( has_header_image() ) {
-	$json->image = array(
-		'type' => 'Image',
-		'url'  => get_header_image(),
-	);
-}
-
-$json->inbox  = get_rest_url( null, "/activitypub/1.0/users/$author_id/inbox" );
-$json->outbox = get_rest_url( null, "/activitypub/1.0/users/$author_id/outbox" );
-
-if ( method_exists( 'Magic_Sig', 'get_public_key' ) ) {
-	// phpcs:ignore
-	$json->publicKey = array(
-		'id'           => get_author_posts_url( $author_id ) . '#key',
-		'owner'        => get_author_posts_url( $author_id ),
-		'publicKeyPem' => Magic_Sig::get_public_key( $author_id ),
-	);
-}
-
-header( 'Content-Type: application/activity-json', true );
-
-// filter output
-$json = apply_filters( 'activitypub_profile_array', $json );
-
-/*
- * Action triggerd prior to the ActivityPub profile being created and sent to the client
- */
-do_action( 'activitypub_profile_pre' );
-
-$options = 0;
-// JSON_PRETTY_PRINT added in PHP 5.4
-if ( get_query_var( 'pretty' ) ) {
-	$options |= JSON_PRETTY_PRINT; // phpcs:ignore
-}
-
-/*
- * Options to be passed to json_encode()
- *
- * @param int $options The current options flags
- */
-$options = apply_filters( 'activitypub_profile_options', $options );
-echo wp_json_encode( $json, $options );
-
-/*
- * Action triggerd after the ActivityPub profile has been created and sent to the client
- */
-do_action( 'activitypub_profile_post' );