diff --git a/config.go b/config.go
index 4ecc4f8..5eda4bf 100644
--- a/config.go
+++ b/config.go
@@ -57,7 +57,7 @@ func loadConfigFile() {
 		filename = user.HomeDir + "/cloud-control-panel.json"
 	}
 
-	tmp := loadDefaultConfig()
+	tmp := loadConfigFromFilename(filename)
 	config = &tmp
 //	os.Exit(1)
 
@@ -191,8 +191,6 @@ func saveConfig() {
 		stuff, _ := marshaler.MarshalToString(config)
 		log.Println(stuff)
 
-		// TODO: Fix this
-		log.Println("FIXME: NOT SAVING CONFIG FILE AS:", filename)
 		writeToFile(filename, stuff)
 /*
 		f, err := os.Create(filename + ".yaml")
@@ -209,18 +207,9 @@ func saveConfig() {
 }
 
 // will load the default config from within the go binary
-func loadDefaultConfig() pb.Config {
-	log.Println("TRY TO LOAD DEFAULT CONFIG")
-	// defaultConfig, _ := packrBox.FindString("protobuf-config.json")
-	defaultConfig, err := packrBox.FindString("protobuf-small.json")
-	log.Println("defaultConfig =", defaultConfig)
-	log.Println("err =", err)
-	log.Println("NEED TO UNMARSHAL THIS HERE")
-	log.Println("NEED TO UNMARSHAL THIS HERE")
-	log.Println("NEED TO UNMARSHAL THIS HERE")
-	// var newpb *pb.Config
+func loadConfigFromFilename(filename string) pb.Config {
 	sets := pb.Config{}
-	b, err := ioutil.ReadFile("resources/protobuf-config.json")
+	b, err := ioutil.ReadFile(filename)
 	if err != nil {
 		log.Println("ioutil.ReadFile() ERROR =", err)
 	}
@@ -231,19 +220,24 @@ func loadDefaultConfig() pb.Config {
 		log.Println("jsonpb.Unmarshal() ERROR =", err)
 	}
 	spew.Dump(sets)
-	// os.Exit(0)
 	return sets
 }
 
-	/*
-	log.Println("ATTEMTED TO UNMARSHAL err =", err)
-	spew.Dump(newpb)
-	if (err == nil) {
-		log.Println("SETTING config to the default config", err)
-		// TODO: save the protobuf somewhere as the user could loose the tokens
-		log.Println("THIS IS PROBABLY REALLY BAD", err)
-		log.Println("THIS IS PROBABLY REALLY BAD", err)
-		log.Println("THIS IS PROBABLY REALLY BAD", err)
-		// config = newpb
+// will load the default config from within the go binary
+func loadDefaultConfig() pb.Config {
+	log.Println("TRY TO LOAD DEFAULT CONFIG")
+	// defaultConfig, _ := packrBox.FindString("protobuf-config.json")
+	b, err := packrBox.FindString("protobuf-small.json")
+	log.Println("b =", b)
+	log.Println("err =", err)
+	// var newpb *pb.Config
+	sets := pb.Config{}
+
+	err = jsonpb.Unmarshal(strings.NewReader(string(b)), &sets)
+	if err != nil {
+		log.Println("jsonpb.Unmarshal() ERROR =", err)
 	}
-	*/
+	spew.Dump(sets)
+	// os.Exit(0)
+	return sets
+}