diff --git a/DBEngine.cpp b/DBEngine.cpp
index b0eb5d2..ede10e5 100755
--- a/DBEngine.cpp
+++ b/DBEngine.cpp
@@ -113,7 +113,7 @@ Relation& DBEngine::getTableFromName(string n){
 }
 
 Relation DBEngine::selection(string attName, string s, Relation r){
-	equality(attName, s, r);
+	return equality(attName, s, r);
 }
 
 //assumes that all attribute titles are unique
diff --git a/Parser.cpp b/Parser.cpp
index 1568341..15873ea 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -507,6 +507,13 @@ vector<string> deleteCMD(vector<string> input, DBEngine &engine)
 	else cout<<"Syntax error!"<<endl;
 }
 
+void query(vector<string> input, DBEngine &engine)
+{
+	PRelation pr(input[0]);
+	
+	input.erase(input.begin());
+}
+
 void par_line(vector<string> input, DBEngine &engine) //calls par_command() or par_query() depending on first item from token list
 {
 /*
@@ -533,7 +540,7 @@ void par_line(vector<string> input, DBEngine &engine) //calls par_command() or p
 			
 		}
 		
-		if ( input[0] == "CREATE")
+		else if ( input[0] == "CREATE")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
@@ -544,7 +551,7 @@ void par_line(vector<string> input, DBEngine &engine) //calls par_command() or p
 			
 		}
 		
-		if ( input[0] == "DELETE")
+		else if ( input[0] == "DELETE")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
@@ -555,7 +562,7 @@ void par_line(vector<string> input, DBEngine &engine) //calls par_command() or p
 			
 		}
 		
-		if ( input[0] == "UPDATE")
+		else if ( input[0] == "UPDATE")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
@@ -566,40 +573,52 @@ void par_line(vector<string> input, DBEngine &engine) //calls par_command() or p
 			
 		}
 			
-		if ( input[0] == "SHOW")
+		else if ( input[0] == "SHOW")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
 			showCMD(input, engine);			
 		}
 		
-		if ( input[0] == "EXIT")
+		else if ( input[0] == "EXIT")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
 			exitCMD(input, engine);			
 		}
 		
-		if ( input[0] == "OPEN")
+		else if ( input[0] == "OPEN")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
 			openCMD(input, engine);			
 		}
 		
-		if ( input[0] == "SAVE")
+		else if ( input[0] == "SAVE")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
 			saveCMD(input, engine);			
 		}
 		
-		if ( input[0] == "CLOSE")
+		else if ( input[0] == "CLOSE")
 		{
 			cout<<"\nPassing the following arguments to dbEngine: \nCommand: "<<input[0]<<endl;
 			input.erase(input.begin());
 			closeCMD(input, engine);			
 		}
+		
+		else if( input[1] == "<-")
+		{
+			cout<<"Passing query to dbEngine."<<endl;
+			query(input, engine);
+		}
+		
+		else
+		{
+			cout<<"Not a valid command or query."<<endl;
+			exit(1);
+		}
 	}
 }
 
diff --git a/test b/test
index 1887d71..58c8923 100755
Binary files a/test and b/test differ