diff --git a/diskusage_diezweite.py b/diskusage_diezweite.py
index 51eee0b..e1b486d 100755
--- a/diskusage_diezweite.py
+++ b/diskusage_diezweite.py
@@ -3,19 +3,36 @@
 
 import os
 
-class partobj(object): #my first class :)
-#    def __init__(self):
-#        self.dev = ""
 
-    # getting all local partitions plus their uuids
-    def getpartitions(self):
-        self.uuids = os.listdir("/dev/disk/by-uuid") #folder contains symlinks to the actual disk devices 
-        self.parts = {} #initializing empty dictionary for partitions and uuids
-        for self.uuid in self.uuids: #write /dev/names as keys and uuids as values in the dictionary
-            self.parts["/dev/" + os.readlink("/dev/disk/by-uuid/" + self.uuid)[6:]] = self.uuid
-        return self.parts #return the dictionary for further useage
+def getmountpoint(device):
+    mtab = open("/etc/mtab", "r")
+    for line in mtab.readlines():
+        if device in line:
+           return line.split()[1]
+           break
+    mtab.close()
+
+
+# getting all local partitions plus their uuids
+def getpartitions():
+    uuids = os.listdir("/dev/disk/by-uuid") #folder contains symlinks to the actual disk devices 
+    parts = {} #initializing empty dictionary for partitions and uuids
+    for uuid in uuids: #write /dev/names as keys and uuids as values in the dictionary
+        parts["/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:]] = uuid
+    return parts #return the dictionary for further useage
+
+
+test = getpartitions()
+print test
+
+print ""
+
+for device in test.keys():
+    ismounted = getmountpoint(device)
+    if ismounted != None:
+        print str(device) + " is mounted at " + str(ismounted)
+    else:
+        print str(device) + " is not mounted"
+
 
 
-test = partobj()
-bla = test.getpartitions()
-print bla