diff --git a/Source/MainComponent.cpp b/Source/MainComponent.cpp
index 15bb38b..ffb6e6f 100644
--- a/Source/MainComponent.cpp
+++ b/Source/MainComponent.cpp
@@ -20,6 +20,9 @@
 //[Headers] You can add your own extra header files here...
 //[/Headers]
 
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
 #include "MainComponent.h"
 
 
@@ -817,7 +820,7 @@ void MainComponent::save ()
 
 void MainComponent::create(juce::String const &projectName)
 {
-	size_t id = m_rbmSelect->getSelectedId()-1;
+	int id = m_rbmSelect->getSelectedId()-1;
 	bool shouldAddItem = true;
 	if (id == 0)
 	{
@@ -868,7 +871,12 @@ void MainComponent::destroy()
 
 const juce::String& MainComponent::getBaseDir()
 {
-	m_baseDir = String("./") + projectNameLabel->getText();
+	struct passwd *pw = getpwuid(getuid());
+
+	const char *homedir = pw->pw_dir;
+
+
+	m_baseDir = String(homedir) + String("/.rbm/") + projectNameLabel->getText();
 
 	return m_baseDir;