diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js
index 90fa92e1..1c6e45c6 100644
--- a/app/controllers/forms.server.controller.js
+++ b/app/controllers/forms.server.controller.js
@@ -38,7 +38,7 @@ exports.create = function(req, res) {
 /**
  * Upload PDF 
  */
-exports.uploadPDF = function(req, res, next) {
+exports.uploadPDF = function(req, res) {
 	var parser = new PDFParser(),
 		pdfFile = req.files.file;
 
@@ -50,34 +50,33 @@ exports.uploadPDF = function(req, res, next) {
 	if (req.files) { 
 		
 		if (pdfFile.size === 0) {
-		    return next(new Error('Hey, first would you select a file?'));
+			return res.status(400).send({
+				message: 'Hey, first would you select a file?'
+			});
 		}
 		fs.exists(pdfFile.path, function(exists) { 
 			if(exists) { 
-				console.log('UPLOADING FILE \N\N');
-				res.end('Got your file!');
-				next();
-				// return res.status(200); 
+				// console.log('UPLOADING FILE \N\N');
+				return res.status(200).send({
+					message: 'Got your file!'
+				}); 
 			} else { 
-				res.end('DID NOT get your file!');
-				next();
-				// return res.status(400); 
+				return res.status(400).send({
+					message: 'Did NOT get your file!'
+				});
 			} 
 		}); 
 	} 
 
-	next(new Error('FILE NOT UPLOADED'));
-
-	// return res.status(400);
-	// res.json(pdfFile);
+	return res.status(400).send({
+		message: 'FILE NOT UPLOADED'
+	});
 };
 
 /**
  * Show the current form
  */
 exports.read = function(req, res) {
-	// console.log(req.form);
-	console.log(req.form.form_fields[7]);
 	res.json(req.form);
 };
 
@@ -112,7 +111,7 @@ exports.createSubmission = function(req, res) {
 	fdfData = pdfFiller.fillFdfTemplate(fdfTemplate, submission.form_fields, null);
 
 	submission.fdfData = fdfData;
-	
+
 	//Create new file
 	// pdfFiller.fillForm( form.pdf.path, config.pdfUploadPath+form.title+'/'+form.title+'_'+Date.now()+'_submission.pdf', fdfData, function() { 
 		// console.log('\n\n\n fdfData');
diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js
index 08d48b79..1ed18629 100644
--- a/app/models/form.server.model.js
+++ b/app/models/form.server.model.js
@@ -111,7 +111,6 @@ FormSchema.pre('save', function (next) {
 	}
 });
 
-
 //Autogenerate FORM from PDF if 'isGenerated' flag is 'true'
 FormSchema.pre('save', function (next) {
 	var field; 
@@ -164,7 +163,6 @@ FormSchema.pre('save', function (next) {
 
 	//Throw error if we encounter form with invalid type
 	next();
-
 });
 
 FormSchema.methods.convertToFDF = function (cb) {
diff --git a/app/models/form_submission.server.model.js b/app/models/form_submission.server.model.js
index 9eabbc21..225e7263 100644
--- a/app/models/form_submission.server.model.js
+++ b/app/models/form_submission.server.model.js
@@ -97,14 +97,14 @@ FormSubmissionSchema.pre('save', function (next) {
 
 
 			pdfFiller.fillForm(_form.pdf.path, dest_path, this.fdfData, function(err){
-				console.log("fdfData: \n");
+				console.log('fdfData: \n');
 				console.log(that.fdfData);
 
-				// console.log("_form.pdf.path: "+_form.pdf.path);
-				// console.log("dest_path: "+dest_path);
+				// console.log('_form.pdf.path: '+_form.pdf.path);
+				// console.log('dest_path: '+dest_path);
 
 				if(err) {
-					console.log("\n err.message: "+err.message);
+					console.log('\n err.message: '+err.message);
 					next( new Error(err.message) );
 				}
 				console.log('Field data from Form: '+_form.title.trim()+' outputed to new PDF: '+dest_path);
diff --git a/uploads/pdfs/snthsnthsnth_submission_1435630540895.pdf b/uploads/pdfs/snthsnthsnth_submission_1435630540895.pdf
new file mode 100644
index 00000000..23460f8e
Binary files /dev/null and b/uploads/pdfs/snthsnthsnth_submission_1435630540895.pdf differ
diff --git a/uploads/pdfs/snthsnthsnth_submission_1435631451599.pdf b/uploads/pdfs/snthsnthsnth_submission_1435631451599.pdf
new file mode 100644
index 00000000..23460f8e
Binary files /dev/null and b/uploads/pdfs/snthsnthsnth_submission_1435631451599.pdf differ
diff --git a/uploads/pdfs/snthsnthsnth_submission_1435631701333.pdf b/uploads/pdfs/snthsnthsnth_submission_1435631701333.pdf
new file mode 100644
index 00000000..23460f8e
Binary files /dev/null and b/uploads/pdfs/snthsnthsnth_submission_1435631701333.pdf differ
diff --git a/uploads/pdfs/snthsnthsnth_submission_1435632021223.pdf b/uploads/pdfs/snthsnthsnth_submission_1435632021223.pdf
new file mode 100644
index 00000000..23460f8e
Binary files /dev/null and b/uploads/pdfs/snthsnthsnth_submission_1435632021223.pdf differ
diff --git a/uploads/pdfs/snthsnthsnth_submission_1435632187529.pdf b/uploads/pdfs/snthsnthsnth_submission_1435632187529.pdf
new file mode 100644
index 00000000..23460f8e
Binary files /dev/null and b/uploads/pdfs/snthsnthsnth_submission_1435632187529.pdf differ
diff --git a/uploads/tmp/1435631554812.pdf b/uploads/tmp/1435631554812.pdf
new file mode 100644
index 00000000..e090513d
Binary files /dev/null and b/uploads/tmp/1435631554812.pdf differ
diff --git a/uploads/tmp/1435632257136.pdf b/uploads/tmp/1435632257136.pdf
new file mode 100644
index 00000000..e090513d
Binary files /dev/null and b/uploads/tmp/1435632257136.pdf differ