diff --git a/AlterBrightness.cpp b/AlterBrightness.cpp
index 2c97b58..1e9a4ff 100644
--- a/AlterBrightness.cpp
+++ b/AlterBrightness.cpp
@@ -2,7 +2,6 @@
 #include <fstream>
 #include <ios>
 #include "AlterBrightness.h"
-using namespace std;
 
 AlterBrightness::AlterBrightness()
 {
@@ -34,8 +33,8 @@ void AlterBrightness::setMaxBrightness(unsigned& max)
 
 void AlterBrightness::chooseChange(char* changeChoice[])
 {
-	ofstream s;
-	s.open("/sys/class/backlight/intel_backlight/brightness", ios::out);
+	std::ofstream s;
+	s.open("/sys/class/backlight/intel_backlight/brightness", std::ios::out);
 	//std::cout << changeChoice << std::endl;
 	//if (1)
 	//	std::cout << changeChoice.compare("inc") << std::endl;
@@ -46,13 +45,13 @@ void AlterBrightness::chooseChange(char* changeChoice[])
 	{
 		AlterBrightness::increaseBrightness();			
 		std::cout << "Increase" << std::endl;
-		std::cout << AlterBrightness::getCurrentBrightness();
+		std::cout << AlterBrightness::getCurrentBrightness() << std::endl;
 		s << AlterBrightness::getCurrentBrightness();
 	}
 	else
 	{
 		AlterBrightness::decreaseBrightness();
-		std::cout << AlterBrightness::getCurrentBrightness();
+		std::cout << AlterBrightness::getCurrentBrightness() << std::endl;
 		s << AlterBrightness::getCurrentBrightness();
 	}	
 	s.close();
diff --git a/BrightnessControl.cpp b/BrightnessControl.cpp
index 197029d..74566e9 100644
--- a/BrightnessControl.cpp
+++ b/BrightnessControl.cpp
@@ -1,21 +1,44 @@
+#include <iostream>
 #include <cstring>
+#include <fstream>
+#include <ios>
 #include "AlterBrightness.h"
+#include "Brightness.h"
 
 int main(int argc, char* argv[])
 {
-	AlterBrightness ab;
-	char* ci = "sdfsdfd";
 	char* control[strlen(*(argv + 1))] = {*(argv + 1)};
 	unsigned changeAmount = atoi(*(argv + 2));
-	unsigned currentBrightness = atoi(*(argv + 3));
-	unsigned maxBrightness = atoi(*(argv + 4));
+	unsigned currentBrightness;
+	unsigned maxBrightness;
+
+	/**
+	std::fstream input;
+	input.open("/sys/class/backlight/intel_backlight/brightness", std::ios::in);
+	input >> currentBrightness;
+	std::cout << currentBrightness << std::endl;
+	input.close();
+
+	input.open("/sys/class/backlight/intel_backlight/max_brightness", std::ios::in);
+	input >> maxBrightness;
+	std::cout << maxBrightness << std::endl;
+	input.close();
+	*/
+
+	AlterBrightness ab;
+	Brightness br;
+	br.grabBrightness();
+	br.grabMaxBrightness();
+
+	currentBrightness = br.getCurrentBrightness();
+	maxBrightness = br.getMaxBrightness();
 
 	ab.setIncrement(changeAmount);
 	ab.setDecrement(changeAmount);
 	ab.setCurrentBrightness(currentBrightness);
 	ab.setMaxBrightness(maxBrightness);
 
-	std::string ctl(*(control));
+	//std::string ctl(*(control));
 	ab.chooseChange((control));
 
 	return 0;