diff --git a/Source/FakeApi.js b/App/ApiFake.js
similarity index 100%
rename from Source/FakeApi.js
rename to App/ApiFake.js
diff --git a/Source/ApiStatic.js b/App/ApiStatic.js
similarity index 100%
rename from Source/ApiStatic.js
rename to App/ApiStatic.js
diff --git a/Source/ApiTransform.js b/App/ApiTransform.js
similarity index 90%
rename from Source/ApiTransform.js
rename to App/ApiTransform.js
index 79e9d01..444ab56 100644
--- a/Source/ApiTransform.js
+++ b/App/ApiTransform.js
@@ -22,7 +22,12 @@ var TransSchemas = {
 */
 
 var ApiSchema = {
-	Note: { // TODO: Figure out renotes
+	__All__: {
+		SourceInstance: {
+			__Eval__: "",
+		},
+	},
+	Note: {
 		Content: {
 			Mastodon: "content",
 			Misskey: "text",
@@ -61,11 +66,10 @@ var ApiSchema = {
 			Misskey: "name",
 		},
 		Type: { // user, bot, channel, group
-			Mastodon: {"__Eval__": `
-				var Type;
-				if (TreeOld.bot) Type = 'Bot';
-				if (TreeOld.group) Type = 'Group';
-				TreeNew[KeyNew] = Type;
+			Mastodon: {__EvalSet__: `
+				if (TreeOld.bot) 'Bot';
+				else
+				if (TreeOld.group) 'Group';
 			`},
 		},
 		Url: {
diff --git a/App/Assets/Sample.jpg b/App/Assets/Sample.jpg
new file mode 100644
index 0000000..c749d92
Binary files /dev/null and b/App/Assets/Sample.jpg differ
diff --git a/App/Elems.js b/App/Elems.js
new file mode 100644
index 0000000..afe9a2b
--- /dev/null
+++ b/App/Elems.js
@@ -0,0 +1,11 @@
+function MakeWindow(Attrs) {
+	var Window = document.createElement('div');
+	if (Attrs) {
+		Object.keys(Attrs).forEach(function(Attr){
+			Window[Attr] = Attrs[Attr];
+		});
+	};
+	Window.className += ' Window';
+	Root.appendChild(Window);
+	return Window;
+};
diff --git a/Source/Friendiiverse.html b/App/Friendiiverse.html
similarity index 77%
rename from Source/Friendiiverse.html
rename to App/Friendiiverse.html
index 167135b..aa79bb3 100644
--- a/Source/Friendiiverse.html
+++ b/App/Friendiiverse.html
@@ -13,7 +13,11 @@ var FriendicaCredentials = 'redacted:redacted';
 // Development
 var Debug = true;
 var UseFakeApi = true;
-var UserData = {};
+		</script>
+		<script data-build-json="true">
+var Assets = {
+	ImgSample: "./Sample.jpg",
+};
 		</script>
 	</head>
 	<body>
@@ -32,14 +36,19 @@ var UserData = {};
 		</div>
 		<div id="Bottom">
 			<button onclick="Root.lastChild.remove();">↩️ Back</button>
-			<button onclick="ComposeNote();">Note</button>
+			<button onclick="ComposeNote();">📝 Note</button>
+			<button onclick="ManageSettings();">⚙️ Settings</button>
+			<button>Profile</button>
 			<a href="https://gitlab.com/octtspacc/Friendiiverse">📜️ Source Code</a>
+			<span>(Pre-Alpha Development Version)</span>
 		</div>
 		<script>NoscriptView.remove();</script>
 		<script src="./Utils.js"></script>
 		<script src="./Strings.js"></script>
 		<script src="./ApiTransform.js"></script>
-		<script src="./FakeApi.js"></script>
+		<script src="./ApiFake.js"></script>
+		<script src="./Net.js"></script>
+		<script src="./Elems.js"></script>
 		<script src="./Main.js"></script>
 		<script>(function(){
 			if (Debug && new URLSearchParams(window.location.hash).get('#Eruda')) {
diff --git a/Source/Main.js b/App/Main.js
similarity index 59%
rename from Source/Main.js
rename to App/Main.js
index 9d8e7ee..fa06c64 100644
--- a/Source/Main.js
+++ b/App/Main.js
@@ -1,5 +1,7 @@
+var Persist = {Servers: {}, Sources: {}, Identities: {},};
+var Present = CopyObj(Persist);
 var Tasker = {};
-var ApiCache = {Notes: {}, Profiles: {},};
+var ApiCache = {Urls: {},};
 
 function DoAsync(First, Then, Data) {
 	var Job = RndId();
@@ -33,81 +35,6 @@ function DoAsync(First, Then, Data) {
 	return Job;
 };
 
-function HttpCodeGood(Code) {
-	var Unit = String(Code)[0];
-	if (['1', '2', '3'].includes(Unit)) {
-		return true;
-	} else
-	if (['4', '5'].includes(Unit)) {
-		return false;
-	};
-};
-
-function ApiCall(Data, Proc) {
-	// Data = {Target: "Friendica", Method: "...", Data: {}, Call: (), CallFine: (), CallFail: ()}
-	var Req = new XMLHttpRequest();
-	Req.Proc = Proc;
-	Req.onloadend = function(){
-		try {
-			this.responseJson = JSON.parse(this.responseText);
-			this.responseLog = this.responseJson;
-		} catch(Ex) {
-			this.responseLog = this.responseText;
-		};
-		if (Data.Call) {
-			Data.Call(this);
-		};
-		if (HttpCodeGood(this.status)) {
-			LogDebug([this.status, this.responseLog], 'l');
-			if (Data.CallFine) {
-				Data.CallFine(this);
-			};
-		} else {
-			LogDebug([this.status, this.responseLog], 'e');
-			if (Data.CallFail) {
-				Data.CallFail(this);
-			};
-		};
-	};
-	if (Data.Target == 'Mastodon') {
-		Req.open('GET', `${MastodonUrl}/api/v1/${Data.Method}`, true);
-	} else
-	if (Data.Target == 'Friendica') {
-		Req.open('GET', `${FriendicaUrl}/api/${Data.Method}.json`, true);
-		Req.setRequestHeader('Authorization', `Basic ${btoa(FriendicaCredentials)}`);
-	};
-	Req.send();
-};
-
-/*
-function DisplayFriendicaTimeline(Timeline) {
-	ApiCall({Target: "Friendica", Method: Timeline, CallFine: function(Res){
-		DataView.innerHTML = Res.responseText;
-		JSON.parse(DataView.innerHTML).forEach(function(Item){
-			var Title = Item.friendica_title ? `<h2>${Item.friendica_title}</h2>` : '';
-			TimelineView.innerHTML += `<div class=PostView>
-				<a href="${Item.external_url}">${Item.created_at}</a>
-				${Item.friendica_author.url}
-				${Title}
-				${Item.friendica_html}
-			</div>`;
-		});
-	}});
-};
-*/
-
-function MakeWindow(Attrs) {
-	var Window = document.createElement('div');
-	if (Attrs) {
-		Object.keys(Attrs).forEach(function(Attr){
-			Window[Attr] = Attrs[Attr];
-		});
-	};
-	Window.className += ' Window';
-	Root.appendChild(Window);
-	return Window;
-};
-
 function DisplayProfile(Profile) {
 	var Window = MakeWindow({className: "Profile"});
 	Window.innerHTML += `<div class="" style="display: inline-block;">
@@ -121,7 +48,11 @@ function DisplayProfile(Profile) {
 			</div>
 		</a>
 	</div>`;
-	DoAsync(FetchMastodon, FillTimeline);
+	DoAsync(FetchMastodon, FillTimeline, Profile);
+};
+
+function FetchNotes(Profile, Proc) {
+	
 };
 
 function FetchMastodon(Proc) {
@@ -140,7 +71,7 @@ function ResFetchMastodon(Res) {
 function FillTimeline(Notes) {
 	Notes.forEach(function(Note){
 		Root.lastChild.innerHTML += `<div class="View Note">
-			<a href="${Note.Profile.Url}" onclick="DisplayProfile(ApiCache.Profiles['${Note.Profile.Url}']); return false;">
+			<a href="${Note.Profile.Url}" onclick="DisplayProfile(ApiCache.Urls['${Note.Profile.Url}']); return false;">
 				<img class="Profile Icon" src="${Note.Profile.Icon}"/>
 				${Note.Profile.Name}
 			</a>
@@ -155,7 +86,7 @@ function FetchFeatured(Proc) {
 		var Featured = FakeApi.Friendiiverse.Featured;
 		Object.values(Featured).forEach(function(Profiles){
 			Profiles.forEach(function(Profile){
-				ApiCache.Profiles[Profile.Url] = Profile;
+				ApiCache.Urls[Profile.Url] = Profile;
 			});
 		});
 		Tasker[Proc[0]].Return(Featured);
@@ -169,7 +100,7 @@ function FillFeatured(Categories) {
 	Object.values(Categories).forEach(function(Profiles){
 		Profiles.forEach(function(Profile){
 			Window.innerHTML += `<div>
-				<a href="${Profile.Url}" onclick="DisplayProfile(ApiCache.Profiles['${Profile.Url}']); return false;">
+				<a href="${Profile.Url}" onclick="DisplayProfile(ApiCache.Urls['${Profile.Url}']); return false;">
 					<div>
 						<img src="${Profile.Banner}"/>
 					</div>
@@ -203,6 +134,7 @@ function ComposeNote() {
 	var Window = MakeWindow();
 	Window.innerHTML += `
 		<h2>Compose</h2>
+		<p>Posting in: [Channel]</p>
 		<textarea style="width: 100%; height: 20em;"></textarea>
 		<p>
 			<button onclick="PostNote(this.parentNode.parentNode.querySelector('textarea').value);">Note!</button>
@@ -211,6 +143,17 @@ function ComposeNote() {
 };
 function PostNote(Text) {
 	Obj = ExtrimObj(ApiSchema.Note);
+	Obj.Content = Text;
+	// Find out current profile and destination channel to do a proper net request
+};
+
+function ManageSettings() {
+	MakeWindow().innerHTML = `
+		* Sources
+		* Identities
+		* Data Import/Export
+		* Cache Persistance
+	`;
 };
 
 DoAsync(FetchFeatured, FillFeatured);
diff --git a/App/Net.js b/App/Net.js
new file mode 100644
index 0000000..c67b222
--- /dev/null
+++ b/App/Net.js
@@ -0,0 +1,45 @@
+function ApiCall(Data, Proc) {
+	// Data = {Target: "Friendica", Method: "...", Data: {}, Call: (), CallFine: (), CallFail: ()}
+	var Req = new XMLHttpRequest();
+	Req.Proc = Proc;
+	Req.onloadend = function(){
+		try {
+			this.responseJson = JSON.parse(this.responseText);
+			this.responseLog = this.responseJson;
+		} catch(Ex) {
+			this.responseLog = this.responseText;
+		};
+		if (Data.Call) {
+			Data.Call(this);
+		};
+		if (IsHttpCodeGood(this.status)) {
+			LogDebug([this.status, this.responseLog], 'l');
+			if (Data.CallFine) {
+				Data.CallFine(this);
+			};
+		} else {
+			LogDebug([this.status, this.responseLog], 'e');
+			if (Data.CallFail) {
+				Data.CallFail(this);
+			};
+		};
+	};
+	if (Data.Target == 'Mastodon') {
+		Req.open('GET', `${MastodonUrl}/api/v1/${Data.Method}`, true);
+	} else
+	if (Data.Target == 'Friendica') {
+		Req.open('GET', `${FriendicaUrl}/api/${Data.Method}.json`, true);
+		Req.setRequestHeader('Authorization', `Basic ${btoa(FriendicaCredentials)}`);
+	};
+	Req.send();
+};
+
+function IsHttpCodeGood(Code) {
+	Code = String(Code)[0];
+	if (['1', '2', '3'].includes(Code)) {
+		return true;
+	} else
+	if (['4', '5'].includes(Code)) {
+		return false;
+	};
+};
diff --git a/Source/Strings.js b/App/Strings.js
similarity index 100%
rename from Source/Strings.js
rename to App/Strings.js
diff --git a/Source/Style.css b/App/Style.css
similarity index 100%
rename from Source/Style.css
rename to App/Style.css
diff --git a/Source/Utils.js b/App/Utils.js
similarity index 93%
rename from Source/Utils.js
rename to App/Utils.js
index 13c4e67..2d1d886 100644
--- a/Source/Utils.js
+++ b/App/Utils.js
@@ -3,7 +3,11 @@ function ForceList(Item) {
 };
 
 function RndId() {
-	return `${Date.now()}${Math.random()}`;
+	return `${Date.now()}${Math.random() + Math.random()}`;
+};
+
+function UrlDomain(Url) {
+	return Url.split('//')[1].split('/')[0];
 };
 
 function LogDebug(Data, Status) {
@@ -112,6 +116,9 @@ function JsonTransformCycleB(TreeOld, SchemaNew, NodeNew, TypeOld) {
 				Object.keys(KeyOld).forEach(function(KeyObj){
 					if (KeyObj === '__Eval__') {
 						eval(KeyOld[KeyObj]);
+					} else
+					if (KeyObj === '__EvalSet__') {
+						TreeNew[KeyNew] = eval(KeyOld[KeyObj]);
 					};
 				});
 			} else {
diff --git a/Build.py b/Build.py
index b014922..c35b975 100755
--- a/Build.py
+++ b/Build.py
@@ -5,7 +5,7 @@ from pathlib import Path
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 os.makedirs('./Dist', exist_ok=True)
 
-os.chdir('./Source')
+os.chdir('./App')
 
 with open(f'./Friendiiverse.html', 'r') as Base:
 	Base = Base.read()
@@ -20,6 +20,9 @@ def FragReplace(Find, Replace, Pattern='*.*'):
 				File = Prefix + File
 				Base = Base.replace(Find.format(File=File), Frag)
 
+#BaseNew = []
+#BaseNew += Base.split('<script data-build-json="true">')
+
 FragReplace('<link rel="stylesheet" href="{File}"/>', '<style data-source="{File}">{Frag}</style>',   '*.css')
 FragReplace('<script src="{File}"></script>',         '<script data-source="{File}">{Frag}</script>', '*.js')
 
