diff --git a/moonlight/gfx/ui/creditsbtn.png b/moonlight/gfx/ui/creditsbtn.png
new file mode 100644
index 0000000..eaf7575
Binary files /dev/null and b/moonlight/gfx/ui/creditsbtn.png differ
diff --git a/moonlight/gfx/ui/newgamebtn.png b/moonlight/gfx/ui/newgamebtn.png
new file mode 100644
index 0000000..4a63683
Binary files /dev/null and b/moonlight/gfx/ui/newgamebtn.png differ
diff --git a/moonlight/src/GameStates.js b/moonlight/src/GameStates.js
index 9bf9adf..222f404 100644
--- a/moonlight/src/GameStates.js
+++ b/moonlight/src/GameStates.js
@@ -466,11 +466,6 @@ GameState.prototype.update = function()
     this.scoreText.setText("" + player.score);
 }
 
-function Boot()
-{
-    Phaser.State.call(game, this);
-}
-
 var Boot = function(game) {
 }
 
@@ -525,11 +520,52 @@ Preloader.prototype.create = function()
 {
     function goalready() {
 	this.preloadBar.destroy();
-	game.state.start('game', true, false);
+	game.state.start('startscreen', true, false);
     }
 
     var tween = this.add.tween(this.preloadBar).to({ alpha: 0 }, 1000, Phaser.Easing.Linear.None, true);
     tween.onComplete.add(goalready, this);
 }
 
+var StartScreen = function(game) {
+}
 
+StartScreen.prototype.create = function()
+{
+    this.startGameButton = game.add.button((640 / 2) - (224/2),
+					   100,
+					   'newgamebtn',
+					   this.startGameClicked,
+					   this,
+					   1,
+					   0);
+    this.creditsButton = game.add.button((640 / 2) - (182/2),
+					 200,
+					 'creditsbtn',
+					 this.creditsClicked,
+					 this,
+					 1,
+					 0);
+}
+
+StartScreen.prototype.startGameClicked = function()
+{
+    this.startGameButton.destroy();
+    this.creditsButton.destroy();
+    game.state.start('game', true, false);
+}
+
+StartScreen.prototype.creditsClicked = function()
+{
+    console.log("Roll the credits dumbass");
+}
+
+var EndScreen = function(game) {
+}
+
+EndScreen.prototype.create = function()
+{
+    this.scoreText = this.game.add.text(
+        320, 240, 'GAME OVER', 
+	{ font: '32px Arial', fill: '#ffffff' });
+}
diff --git a/moonlight/src/Settings.js b/moonlight/src/Settings.js
index 67c4905..01ce69f 100644
--- a/moonlight/src/Settings.js
+++ b/moonlight/src/Settings.js
@@ -165,6 +165,20 @@ var moonlightSettings = {
 	}
     ],
     'spritesheets': [
+	{
+	    'name': 'newgamebtn',
+	    'path': 'gfx/ui/newgamebtn.png',
+	    'width': 224,
+	    'height': 64,
+	    'frames': 2
+	},
+	{
+	    'name': 'creditsbtn',
+	    'path': 'gfx/ui/creditsbtn.png',
+	    'width': 182,
+	    'height': 64,
+	    'frames': 2
+	},
 	{
 	    'name': 'clock_minutehand',
 	    'path': 'gfx/ui/clock_minutehand.png',
diff --git a/moonlight/src/main.js b/moonlight/src/main.js
index 00a16a9..cc57a8c 100644
--- a/moonlight/src/main.js
+++ b/moonlight/src/main.js
@@ -7,10 +7,8 @@ var game = new Phaser.Game(SCREEN_WIDTH, SCREEN_HEIGHT, Phaser.AUTO, 'uiGameDisp
 game.state.add('boot', Boot, false);
 game.state.add('preloader', Preloader, false);
 game.state.add('game', GameState, false);
+game.state.add('startscreen', StartScreen, false);
+game.state.add('endscreen', EndScreen, false);
 
 game.state.start('boot');
 
-
-
-
-