diff --git a/src/controller/attach.py b/src/controller/attach.py
index 246a5f5..504f314 100644
--- a/src/controller/attach.py
+++ b/src/controller/attach.py
@@ -1,15 +1,24 @@
 # -*- coding: utf-8 -*-
-""" Attachment upload  methods for different kind of posts in VK."""
+""" Attachment upload  methods for different kind of posts in VK. This should become the framework for posting attachment files to the social network."""
 import os
-import widgetUtils
 import logging
+import widgetUtils
 from wxUI.dialogs import attach as gui
 from wxUI.dialogs import selector
 log = logging.getLogger("controller.attach")
 
-class attachmentUploader(object):
+class attachFromLocal(object):
+	""" Controller used in some sections of the application, mainly for uploading photos from the local computer to VK.
+		This controller will not upload the contents by itself, but will generate the data structures for being send over the VK API.
+		At the current time, only photo uploading is supported."""
+
 	def __init__(self, voice_messages=False):
+		""" Constructor.
+		@voice_messages bool: If True, will add a button for sending voice messages. Functionality for this button has not been added yet.
+		"""
+		# Self.attachments will hold a reference to all attachments added to the dialog.
 		self.attachments = list()
+		# Type is just a reference, as there will be local and online based attachments.
 		self.type = "local"
 		self.dialog = gui.attachDialog(voice_messages)
 		widgetUtils.connect_event(self.dialog.photo, widgetUtils.BUTTON_PRESSED, self.upload_image)
@@ -18,8 +27,13 @@ class attachmentUploader(object):
 		log.debug("Attachments controller started.")
 
 	def upload_image(self, *args, **kwargs):
+		""" allows uploading an image from the computer. In theory
+		"""
+		# toDo: Basically description is not working here. Research on how to add description to uploaded images needs attention.
+		# For now, we fake a description, as it is not being send anymore.
 		image, description  = self.dialog.get_image()
 		if image != None:
+			# Define data structure for this attachment, as will be required by VK API later.
 			imageInfo = {"type": "photo", "file": image, "description": os.path.basename(image)}
 			log.debug("Image data to upload: %r" % (imageInfo,))
 			self.attachments.append(imageInfo)
@@ -29,6 +43,7 @@ class attachmentUploader(object):
 			self.dialog.remove.Enable(True)
 
 	def remove_attachment(self, *args, **kwargs):
+		""" Remove the currently focused item from the attachments list."""
 		current_item = self.dialog.attachments.get_selected()
 		log.debug("Removing item %d" % (current_item,))
 		if current_item == -1: current_item = 0
@@ -38,14 +53,23 @@ class attachmentUploader(object):
 		log.debug("Removed")
 
 	def check_remove_status(self):
+		""" Checks whether the remove button should remain enabled."""
 		if len(self.attachments) == 0 and self.dialog.attachments.get_count() == 0:
 			self.dialog.remove.Enable(False)
 
-class attach(object):
+class attachFromOnline(object):
+	""" this was the previously working audio attachment uploader. As VK has deprecated their Audio API for third party clients, this class will not work.
+	However, I have decided to keep this here so in future it may be modified to attach different kind of online based attachments, such as posted photos, videos, etc.
+	"""
 
 	def __init__(self, session):
+		""" Default constructor.
+		@session vk.session: An VK session, capable of calling methods from the VK API.
+		"""
 		self.session = session
+		# Self.attachments will hold a reference to all attachments added to the dialog.
 		self.attachments = list()
+		# Define type as online.
 		self.type = "online"
 		self.dialog = gui.attachDialog()
 		widgetUtils.connect_event(self.dialog.audio, widgetUtils.BUTTON_PRESSED, self.add_audio)
@@ -54,6 +78,7 @@ class attach(object):
 		log.debug("Attachments controller started.")
 
 	def add_audio(self, *args, **kwargs):
+		""" Allow adding an audio directly from the user's audio library."""
 		list_of_audios = self.session.vk.client.audio.get(count=1000)
 		list_of_audios = list_of_audios["items"]
 		audios = []
@@ -63,13 +88,14 @@ class attach(object):
 		if select.get_response() == widgetUtils.OK and select.attachments.GetCount() > 0:
 			attachments = select.get_all_attachments()
 			for i in attachments:
-				print list_of_audios[i].keys()
 				list_of_audios[i]["type"] = "audio"
 				self.attachments.append(list_of_audios[i])
 
 	def parse_attachments(self):
+		""" Retrieve all attachments and convert them to data structures required by VK API."""
 		result = ""
 		for i in self.attachments:
+			# Define data structures required by VK API.
 			preresult = "{0}{1}_{2}".format(i["type"], i["owner_id"], i["id"])
 			result = preresult+","
 		return result
\ No newline at end of file
diff --git a/src/controller/buffers.py b/src/controller/buffers.py
index 20b057f..956a2f8 100644
--- a/src/controller/buffers.py
+++ b/src/controller/buffers.py
@@ -658,7 +658,7 @@ class chatBuffer(baseBuffer):
 		return retrieved
 
 	def add_attachment(self, *args, **kwargs):
-		a = attach.attach(self.session)
+		a = attach.attachFromOnline(self.session)
 		r = a.parse_attachments()
 		if r != "":
 			self.attachments_to_be_sent = r
diff --git a/src/controller/messages.py b/src/controller/messages.py
index d47983d..eb6e051 100644
--- a/src/controller/messages.py
+++ b/src/controller/messages.py
@@ -70,7 +70,7 @@ class post(object):
 		checker.clean()
 
 	def show_attach_dialog(self, *args, **kwargs):
-		a = attach.attachmentUploader()
+		a = attach.attachFromLocal()
 		if len(a.attachments) != 0:
 			self.attachments = a.attachments