diff --git a/app/controllers/journal_controller.rb b/app/controllers/journal_controller.rb
index 6291496..0cc32ca 100644
--- a/app/controllers/journal_controller.rb
+++ b/app/controllers/journal_controller.rb
@@ -21,7 +21,19 @@ def view
 	end
 
 	def load
-		dates = params[:dates].split(/,/)
+		if entryDate = params['before-date']
+			@entry= JournalEntry.where(:date.lt => entryDate).order([[:date, Mongo::DESCENDING]]).first()
+			if @entry
+				render :content_type => 'application/javascript', :layout => false, :inline => <<-EOI
+					$("#spinner").remove();window.loadingNext = false;
+					$("#journal-data").append(<%= raw(render(:partial => 'entry', :locals => { :entry => @entry, :today => false }).to_json) %>);
+				EOI
+			else
+				render  :content_type => 'application/javascript', :text => 'window.NoMoreData = true;$("#spinner").remove();', :layout => false
+			end
+		else
+			# Something else
+		end
 	end
 
 	def search
diff --git a/app/views/journal/view.html.erb b/app/views/journal/view.html.erb
index 9f12cb0..b6912d5 100644
--- a/app/views/journal/view.html.erb
+++ b/app/views/journal/view.html.erb
@@ -5,7 +5,8 @@
 	<div id="tools">
 		<button id="bold" style="font-weight: bold">B</button>
 		<button id="italic" style="font-style: italic">I</button>
-		<button id="hiliteColor" data-arg="#ffff00" style="background: #990">Highlight</button>		
+		<button id="code" data-arg="Droid Sans Mono, Courier, monospace" style="font-family: Droid Sans Mono, Courier, monospace;">Code</button>
+		<button id="highlight" data-arg="#ffff00" style="background: #990">Highlight</button>
 		<button id="removeformat">Clear formatting</button>
 	</div>
 </div>
@@ -37,6 +38,7 @@
 </div>
 </div>
 <script>
+var LoadData = <%=raw url_for(:load).to_json %>;
 jQuery(function ($) {
 	$(".journal-entry").live('blur', function () {
 		$.ajax(<%=raw url_for(:update).to_json %>, { 'type' : 'POST',  'data' : { 'date' : $(this).data('date'), 'entry' : $(this).html()  } })
@@ -51,87 +53,10 @@ jQuery(function ($) {
 			 $(".journal-entry[data-date=\""+date+"\"]").focus();
 		} else {
 			console.log("Can't find %s - %o ", date, journal);
-			// Load journal?
+			// Load journal & display in popup?
 		}
 	});
 
-
-	var resize = function () {
-		$('#journal-pane-container, #sidebar').css('height', ($(window).height()-32)+"px");
-		$('#journal-pane').css('min-height', '100%');
-		$('#today').css('width', ($('#journal-data').width())+"px");
-		var res = $("#search-results");
-		res.css('overflow-y','auto');
-		res.css('height', ($(window).height() - 32 - res[0].offsetTop)+"px");
-	};
-	resize();
-	$(window).resize(resize);
-
-	var cont = $('#journal-pane-container');
-	//cont.scrollTop(64);
-	var i = 0;
-	cont.scroll(function (e) {
-		if (cont.scrollTop() < 64 && false) {
-			console.log("Loading more content...");
-			i += 1;
-			var h = 83 + parseInt(Math.random() * 300);
-			var first_child = $("#journal-pane :first-child").first();
-			var offset = first_child.offset().top;
-			console.log(first_child);
-			$('#journal-pane').prepend('<div style="height: '+h+'px; border: 1px solid #ccc;">Blah '+i+'</div>');
-			console.log("Scroll top was %i is now %i", offset, first_child.offset().top);
-			console.log(first_child);
-			cont.scrollTop(first_child.offset().top);
-			// Load more content...
-		}
-	});
-
-
-	function clearStyleFromSelection() {
-		var sel = window.getSelection();
-		var blat = [], postscan = [];
-		for (var i = 0; i < sel.rangeCount; i++) {
-			var range = sel.getRangeAt(i);
-			for (var node = range.startContainer; node && node !== range.endContainer; 
-				node = node.nextSibling) { 
-				if (1 === node.nodeType) {
-					if ('SPAN' === node.nodeName.toUpperCase()) {
-						if ($(node).hasClass('Apple-style-span')) {
-							blat.push(node);
-						}
-					} else {
-						postscan.push(node);
-					}
-				}
-			}
-		}
-		var eliminate = function(index, node) {
-			$(node).replaceWith($(node).html());
-		}
-		$.each(postscan, function (index, node) {
-			$(node).find('.Apple-style-span').each(eliminate);
-		});
-		$.each(blat, eliminate);
-	}
-
-	document.execCommand('styleWithCSS', false, true);
-	$("#tools button").each(function () {
-		var id = $(this).attr('id');
-		var arg = null;
-		arg = $(this).data("arg");
-
-		$(this).click(function () {
-			console.log("execCommand %s", id);
-			if ("removeformat" === id) {
-				document.execCommand('unlink', false, null);
-				document.execCommand('removeformat', false, null);
-				clearStyleFromSelection();
-			} else {
-				document.execCommand(id, false, arg);
-			}
-		});
-	});
-
 	$(function() {
 		$( "#datepicker" ).datepicker({
 			dateFormat : "yy-mm-dd",
diff --git a/config/routes.rb b/config/routes.rb
index 62754b0..6e76b30 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,6 +18,8 @@
 
   get "journal/view"
 
+  get "journal/load", :as => :load
+
   match "journal/search", :as => :search
 
   post "journal/update", :as => :update
diff --git a/public/images/ajax-loader.gif b/public/images/ajax-loader.gif
new file mode 100644
index 0000000..09d621e
Binary files /dev/null and b/public/images/ajax-loader.gif differ
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index fe45776..02693be 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,2 +1,145 @@
-// Place your application-specific JavaScript functions and classes here
-// This file is automatically included by javascript_include_tag :defaults
+jQuery(function ($) {
+	var resize = function () {
+		$('#journal-pane-container, #sidebar').css('height', ($(window).height()-32)+"px");
+		$('#journal-pane').css('min-height', '100%');
+		$('#today').css('width', ($('#journal-data').width())+"px");
+		var res = $("#search-results");
+		res.css('overflow-y','auto');
+		res.css('height', ($(window).height() - 32 - res[0].offsetTop)+"px");
+	};
+	resize();
+	$(window).resize(resize);
+
+
+	
+	// Auto-scroll
+	var cont = $('#journal-pane-container');
+	//cont.scrollTop(64);
+	var i = 0;
+	var spinner = new Image('/images/ajax-spinner.gif');
+	cont.scroll(function (e) {
+		var node = $("#journal-pane-container")[0];
+
+		if (!window.loadingNext) {
+			// Add 32px padding/warning?
+			if (node.scrollTop >= (node.scrollHeight - node.clientHeight - 32)) {
+				console.log("Loading more content...");
+				i += 1;
+				var h = 83 + parseInt(Math.random() * 300);
+				var last_child = $("#journal-data div[data-date]").last();
+				var date = $(last_child).data('date');
+				
+				var load = function () {
+					$('#journal-data').append('<div id="spinner" style="text-align: center;"><img src="/images/ajax-loader.gif"></div>');
+					$.ajax(LoadData+"?before-date="+date);
+					window.loadingNext = true;
+				};
+				if (window.NoMoreData !== true) {
+					if (window.LoadData) {
+						load();
+					} else {
+						// Not loaded page yet?
+						jQuery(load);
+					}
+				}
+			}
+		}
+	});
+
+
+	function eachNodeInRange(range, callback) {
+		for (var node = range.startContainer;
+				node && node !== range.endContainer;
+				node = node.nextSibling) {
+			if (1 === node.nodeType) {
+				callback(node);
+			}
+		}
+	}
+
+	function eachSelectedRange(callback) {
+		var sel = window.getSelection();
+		for (var i = 0; i < sel.rangeCount; i++) {
+			var range = sel.getRangeAt(i);
+			callback(range);
+		}
+	}
+	
+	function clearStyleFromSelection(klass) {
+		var blat = [], postscan = [];
+		eachSelectedRange(function (range) {
+			eachNodeInRange(range, function (node) {
+				if ('SPAN' === node.nodeName.toUpperCase()) {
+					if ($(node).hasClass(klass)) {
+						blat.push(node);
+					}
+				} else {
+					postscan.push(node);
+				}
+			});
+		});
+		var eliminate = function(index, node) {
+			$(node).replaceWith($(node).html());
+		}
+		$.each(postscan, function (index, node) {
+			$(node).find('SPAN.'+klass).each(eliminate);
+		});
+		$.each(blat, eliminate);
+	}
+
+	function rangeIsBlock(range) {
+		var looksLikeBlock = false;
+
+		eachNodeInRange(range, function(node) {
+				switch(node.nodeName) {
+				case 'BR': case 'DIV': case 'P': case 'LI': case 'H1': case 'H2': case 'H3': case 'H4': case 'H5': case 'H6':
+				case 'TABLE': case 'TR': case 'TD': case 'TH': case 'OL': case 'UL': case 'DT': case 'DD': case 'DL':
+					looksLikeBlock = true;
+					break;
+				default:
+					// do nothing
+				}
+		});
+
+		return looksLikeBlock;
+	}
+
+	function wrapSelectionIn(inline_snippet, block_snippet) {
+		var ranges = [];
+		var sel = window.getSelection();
+		for (var i = 0; i < sel.rangeCount; i++) {
+			ranges.push(sel.getRangeAt(i));
+		}
+		$.each(ranges, function (index, range) {
+			if (rangeIsBlock(range)) {
+				range.surroundContents($(block_snippet)[0]);
+			} else {
+				range.surroundContents($(inline_snippet)[0]);
+			}
+		});
+	}
+
+	document.execCommand('styleWithCSS', false, true);
+	$("#tools button").each(function () {
+		var id = $(this).attr('id');
+		var arg = null;
+		arg = $(this).data("arg");
+
+		$(this).click(function () {
+			console.log("execCommand %s", id);
+			if ("removeformat" === id) {
+				document.execCommand('unlink', false, null);
+				document.execCommand('removeformat', false, null);
+				clearStyleFromSelection('Apple-style-span');
+			} else if ("highlight" === id) {
+				// Should we distinguish between inline snippets & blocks?
+				wrapSelectionIn('<span class="journal-entry-highlight"></span>', '<div class="journal-entry-highlight"></div>');
+			} else if ("code" === id) {
+				// Should we distinguish between inline snippets & blocks?
+				wrapSelectionIn('<span class="journal-entry-code"></span>', '<div class="journal-entry-code"></div>');
+			} else {
+				document.execCommand(id, false, arg);
+			}
+		});
+	});
+});
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 68f4e98..7f916fa 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -81,7 +81,8 @@ body {
 	top: 32px;
 	position: relative;
 }
-#journal-pane {
+#journal-data {
+	margin-bottom: 64px;
 /*	padding-top: 64px;*/
 }
 /*#today {
@@ -112,7 +113,7 @@ body {
 #user, #tools {
 	padding: 2px 12px;
 	display: inline-block;
-	width: 20em;
+	width: 40%;
 }
 #tools {
 	-webkit-user-select: none;
@@ -132,11 +133,13 @@ body {
 	padding: 0.5em;
 	line-height: 1.2em;
 }
+
 .journal-entry[contenteditable]:focus {
 	outline: none;
 	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#ffc));
 	background-image: -moz-linear-gradient(top, #fff, #ffc);
 }
+
 .weekend .journal-entry[contenteditable]:focus {
 	outline: none;
 	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#f7f7f7), to(#ffc));
@@ -168,6 +171,7 @@ body {
 #search-results h4 {
 	margin: 0.3em 0.7em;
 }
+
 #search-results h5 {
 	font-family: Fontin, serif;
 	font-style: italic;
@@ -192,6 +196,24 @@ body {
 	background: #ff9999;
 }
 
+.journal-entry-highlight {
+	background: #ffff66;
+	border: 1px solid #ffcc00;
+	padding: 2px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.journal-entry-code {
+	font-family: "Droid Sans Mono", Courier New, Courier, monospace;
+	font-size: 0.9em;
+	background: #eeeeee;
+	padding: 2px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
 
 #search-box input[type="search"] {
 	border: 1px solid #ccc;