diff --git a/cmd/entry_add.lua b/cmd/entry_add.lua
index 50f2bf9..b2bd70c 100644
--- a/cmd/entry_add.lua
+++ b/cmd/entry_add.lua
@@ -14,7 +14,6 @@ local function cmd(args)
 		end
 	end
 	if args[2] == nil then
-		print("No name given")
 		os.exit(1)
 	end
 	entry.attrs.name = args[2]
@@ -35,7 +34,7 @@ local function cmd(args)
 	entry.parent = entries
 	table.insert(entries.children,entry)
 	env.changed = true
-	print(entry.attrs.id)
+	env.cliprint(entry.attrs.id)
 	return entry
 end
 
diff --git a/cmd/entry_list.lua b/cmd/entry_list.lua
index 593c924..b3dbe8f 100644
--- a/cmd/entry_list.lua
+++ b/cmd/entry_list.lua
@@ -4,7 +4,7 @@ local function cmd(args)
 	entries = env.xmlFindTags(entries,"entry")
 	for i,entry in pairs(entries) do
 		if (entry.attrs.removed ~= "true") then
-			print(entry.attrs.id .. " " ..entry.attrs.date.. " " ..entry.attrs.name)
+			env.cliprint(entry.attrs.id .. " " ..entry.attrs.date.. " " ..entry.attrs.name)
 			table.insert(rtn,entry)
 		end
 	end
diff --git a/cmd/field_get.lua b/cmd/field_get.lua
index 87584d5..b312ba9 100644
--- a/cmd/field_get.lua
+++ b/cmd/field_get.lua
@@ -4,7 +4,7 @@ local function cmd(args)
 		if v.attrs.id == args[2] then
 			for i,v in pairs(env.xmlFindTags(v,"fields")[1].children) do
 				if v.attrs.name == args[3] then
-					print(v.children[1].text)
+					env.cliprint(v.children[1].text)
 					return v.children[1].text
 				end
 			end
diff --git a/cmd/field_get_type.lua b/cmd/field_get_type.lua
index 2eb3906..cb689dc 100644
--- a/cmd/field_get_type.lua
+++ b/cmd/field_get_type.lua
@@ -4,7 +4,7 @@ local function cmd(args)
 		if v.attrs.id == args[2] then
 			for i,v in pairs(env.xmlFindTags(v,"fields")[1].children) do
 				if v.attrs.name == args[3] then
-					print(v.attrs.type)
+					env.cliprint(v.attrs.type)
 					return v.attrs.type
 				end
 			end
diff --git a/cmd/field_list.lua b/cmd/field_list.lua
index 924ad73..37b153a 100644
--- a/cmd/field_list.lua
+++ b/cmd/field_list.lua
@@ -4,7 +4,7 @@ local function cmd(args)
 	for i,v in pairs(entries.children) do
 		if v.attrs.id == args[2] and not v.attrs.deleted then
 			for i,v in pairs(env.xmlFindTags(v,"fields")[1].children) do
-				print(v.attrs.name)
+				env.cliprint(v.attrs.name)
 				table.insert(rtn,v)
 			end
 		end
diff --git a/lib/prpw.lua b/lib/prpw.lua
index e573d41..915adb7 100644
--- a/lib/prpw.lua
+++ b/lib/prpw.lua
@@ -1,5 +1,6 @@
 math.randomseed(os.time())
 env = {}
+env.cli = true
 
 function env.loop()
 	local command = env.stringSplit(io.read()," ",3,"\\")
@@ -83,3 +84,9 @@ function env.padNumber(nr,len)
 	end
 	return nr
 end
+
+function env.cliprint(text)
+	if env.cli == true then
+		print(text)
+	end
+end