diff --git a/buildAndUpdateProd.sh b/buildAndUpdateProd.sh
new file mode 100755
index 0000000..ca9e1dd
--- /dev/null
+++ b/buildAndUpdateProd.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+
+# 
+# Push built release files to production server
+#
+
+echo -e "\e[32m\nStarting Build, hold onto your parts... \n\e[0m"
+
+# Build out new release
+cd client
+npm run build
+cd ..
+
+# Remove old releases
+rm release.tar.gz
+
+# only compress client/dist and server with node_modules
+echo -e "\e[32m\nCompressing client and server code... \n\e[0m"
+tar -czf release.tar.gz server node_modules client/dist package.json
+
+#send compressed release to remote machine
+echo -e "\e[32m\nMoving compressed release to production... \n\e[0m"
+rsync -e 'ssh -p 13328' -havzC --update release.tar.gz mab@avidhabit.com:/home/mab/pi/
+
+# Remove Release from local after its been uploaded
+rm release.tar.gz
+
+#uncompress release on server
+echo -e "\e[32m\nExtracting release on production... \n\e[0m"
+ssh mab@avidhabit.com -p 13328 "cd /home/mab/pi/; rm -r server node_modules client; tar -xzf *.tar.gz; rm *.tar.gz; pm2 reload all"
+
+#Congratulate how awesome you are
+echo -e "\e[32m\nRelease Complete! Nice Work! \n\e[0m"
\ No newline at end of file
diff --git a/server/models/Attachment.js b/server/models/Attachment.js
index 808d91e..87a76a8 100644
--- a/server/models/Attachment.js
+++ b/server/models/Attachment.js
@@ -112,15 +112,26 @@ Attachment.processUrl = (userId, noteId, url) => {
 
 		var removeWhitespace = /\s+/g
 
+
 		// console.log('Scraping ', website)
 		const options = {
 			uri: url,
+			simple: true,
+			timeout: 1000 * 10, // 10 seconds
+			headers: {
+				'User-Agent':'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)' //Simulate google headers
+			},
 			transform: function (body) {
 				return cheerio.load(body);
 			}
 		}
 
-		rp(options).then($ => {
+		let requestTimeout = null
+
+		let request = rp(options)
+		.then($ => {
+
+			clearTimeout(requestTimeout)
 
 			var desiredSearchText = ''
 
@@ -191,5 +202,29 @@ Attachment.processUrl = (userId, noteId, url) => {
 			.catch(console.log)
 
 		})
+		.catch(error => {
+			console.log('Issue with scrape')
+			console.log(error)
+			resolve('')
+		})
+
+		requestTimeout = setTimeout( () => {
+			console.log('Cancel the request, its taking to long.')
+			request.cancel()
+
+			desiredSearchText = 'Unable to Scrape URL at this time'
+			const created = Math.round((+new Date)/1000)
+
+			//Create attachment in DB with scrape text and provided data
+			db.promise()
+			.query(`INSERT INTO attachment 
+				(note_id, user_id, attachment_type, text, url, last_indexed) 
+				VALUES (?, ?, ?, ?, ?, ?)`, [noteId, userId, 1, desiredSearchText, url, created])
+			.then((rows, fields) => {
+				resolve(desiredSearchText) //Return found text
+			})
+			.catch(console.log)
+
+		}, (5000))
 	})
 }
\ No newline at end of file