diff --git a/src/Db/DbQuery.py b/src/Db/DbQuery.py
new file mode 100644
index 00000000..10ce773b
--- /dev/null
+++ b/src/Db/DbQuery.py
@@ -0,0 +1,44 @@
+import re
+
+
+# Parse and modify sql queries
+class DbQuery:
+    def __init__(self, query):
+        self.setQuery(query.strip())
+
+    # Split main parts of query
+    def parseParts(self, query):
+        parts = re.split("(SELECT|FROM|WHERE|ORDER BY|LIMIT)", query)
+        parts = filter(None, parts)  # Remove empty parts
+        parts = map(lambda s: s.strip(), parts)  # Remove whitespace
+        return dict(zip(parts[0::2], parts[1::2]))
+
+    # Parse selected fields SELECT ... FROM
+    def parseFields(self, query_select):
+        fields = re.findall("([^,]+) AS ([^,]+)", query_select)
+        return {key: val.strip() for val, key in fields}
+
+    # Parse query conditions WHERE ...
+    def parseWheres(self, query_where):
+        if " AND " in query_where:
+            return query_where.split(" AND ")
+        else:
+            return []
+
+    # Set the query
+    def setQuery(self, query):
+        self.parts = self.parseParts(query)
+        self.fields = self.parseFields(self.parts["SELECT"])
+        self.wheres = self.parseWheres(self.parts.get("WHERE", ""))
+
+    # Convert query back to string
+    def __str__(self):
+        query_parts = []
+        for part_name in ["SELECT", "FROM", "WHERE", "ORDER BY", "LIMIT"]:
+            if part_name == "WHERE" and self.wheres:
+                query_parts.append("WHERE")
+                query_parts.append(" AND ".join(self.wheres))
+            elif part_name in self.parts:
+                query_parts.append(part_name)
+                query_parts.append(self.parts[part_name])
+        return "\n".join(query_parts)
diff --git a/src/Db/__init__.py b/src/Db/__init__.py
index 1f7f580c..5bede9f4 100644
--- a/src/Db/__init__.py
+++ b/src/Db/__init__.py
@@ -1,2 +1,3 @@
 from Db import Db
+from DbQuery import DbQuery
 from DbCursor import DbCursor
\ No newline at end of file