diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3660ea9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+scdl.cfg
diff --git a/README.md b/README.md
index 538a3c6..25b9420 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 scdl
 ====
+##New
+ * This will be the new python version of : https://github.com/lukapusic/soundcloud-dl
 
-This will be the python version of : https://github.com/lukapusic/soundcloud-dl
+##Auth
+ * get your auth token here : http://flyingrub.tk/soundcloud/
diff --git a/scdl.cfg b/scdl.cfg
new file mode 100644
index 0000000..63158ba
--- /dev/null
+++ b/scdl.cfg
@@ -0,0 +1,4 @@
+[scdl]
+auth_token =
+explore_songs = 25
+path = 
diff --git a/scdl.py b/scdl.py
index 5d002a9..01ab36e 100755
--- a/scdl.py
+++ b/scdl.py
@@ -1,44 +1,89 @@
 #!/usr/bin/python3
-"""scdl.
- 
+"""scdl allow you to download music from soundcloud
+
 Usage:
-	scdl.py -l <track_url>
+	scdl.py -l <track_url> [--hidewarnings]
+	scdl.py --me [--hidewarnings]
 	scdl.py -h | --help
 	scdl.py --version
 
- 
+
 Options:
 	-h --help		Show this screen.
-	--version 		Show version.  
-	-l [url]   		Necessary. URL is the url of the soundcloud's page
+	--version		Show version.
+	-l [url]		Necessary. URL is the url of the soundcloud's page.
+	--hidewarnings	Hide Warnings.
 """
 from docopt import docopt
+import configparser
+
+import warnings
+import os
+import signal
+import sys
 
 import soundcloud
-import urllib
-import urllib.request
+import wget
 
+token = ''
 client = soundcloud.Client(client_id='b45b1aa10f1ac2941910a7f0d10f8e28')
-
+filename = ''
 
 def main():
-    print("Soundcloud Downloader")
+	"""
+	Main function, call parse_url
+	"""
+	print("Soundcloud Downloader")
 
-    arguments = docopt(__doc__, version='0.1')
-    print(arguments)
-    print("End of arguments\n")
+	arguments = docopt(__doc__, version='0.1')
+	print(arguments)
 
-    #track_url = 'https://soundcloud.com/iskel/apprenti-sorcier'
-    track_url = arguments["<track_url>"]
-    parse_url(track_url)
+	get_config()
+
+	if arguments["--hidewarnings"]:
+		warnings.filterwarnings("ignore")
+
+	if arguments["-l"]:
+		parse_url(arguments["<track_url>"])
+	elif arguments["--me"]:
+		mystream()
+
+def get_config():
+	"""
+	read the path where to store music
+	"""
+	global token
+	config = configparser.ConfigParser()
+	config.read('scdl.cfg')
+	token = config['scdl']['auth_token']
+	path = config['scdl']['path']
+	os.chdir(path)
+
+def mystream():
+	client = soundcloud.Client(access_token=token)
+	# make an authenticated call
+	current_user = client.get('/me')
+	print('Hello',current_user.username, '!')
+	activities = client.get('/me/activities')
+	print(activities.type)
 
 
+def settags(track):
+	"""
+	Set the tags to the mp3
+	"""
+	print("Settings tags...")
+	user = client.get('/users/' + str(track.user_id), allow_redirects=False)
+	audiofile = my_eyed3.load(filename)
+	audiofile.tag.artist = user.username
+	audiofile.tag.album = track.title
+	audiofile.tag.title = track.title
+
+	audiofile.tag.save()
 
 def get_item(track_url):
 	"""
-	
 	Fetches metadata for an track or playlist
-	
 	"""
 	# Fetches metadata from soundcloud
 	try:
@@ -46,54 +91,90 @@ def get_item(track_url):
 	except Exception as e:
 		print("Could not resolve url " + track_url)
 		print(e, exc_info=True)
-		return False 
+		return False
 	return item
 
-
-
 def parse_url(track_url):
 	"""
-	
 	Detects if the URL is a track or playlists, and parses the track(s) to the track downloader
-	
 	"""
-	
+
 	item = get_item(track_url)
 	if not item:
 		return
-
 	if item.kind == 'track':
 		print("Found a track")
 		download_track(item)
-	
+
+	if item.kind == 'user':
+		print("Found an user profile")
+		download_user(item)
+
 	elif item.kind == "playlist":
 		print("Found a playlist")
 		for track_raw in item.tracks:
 			mp3_url = get_item(track_raw["permalink_url"])
 			if item:
-				download_track(track)
+				download_track(mp3_url)
 			else:
 				print("Could not find track " + track_raw["title"])
 	else:
 		print("Unknown item type")
 
-
+def download_user(user):
+	"""
+	Fetch users data
+	"""
+	offset = 0
+	end_of_tracks = False
+	songs = client.get('/users/' + str(user.id) + '/favorites', limit = 10, offset = offset)
+	while not end_of_tracks:
+		for track in songs:
+			if track.kind == 'track':
+				print("")
+				download_track(track)
+			else:
+				print("End of favorites")
+				end_of_tracks =True
+		offset += 10
 
 def download_track(track):
 	"""
-	
 	Downloads a track
-	
 	"""
 
 	stream_url = client.get(track.stream_url, allow_redirects=False)
 	url = stream_url.location
+
 	title = track.title
 	print("Downloading " + title)
-	filename = title +'.mp3'
-	path = filename
 
-	urllib.request.urlretrieve (url, path)
+	global filename
+	filename = title +'.mp3'
+
+	if not os.path.isfile(filename):
+		wget.download(url, filename)
+	else:
+		print("Music already exists ! (exiting)")
+		sys.exit(0)
+	#settags(track)
+
+	print('')
+	print(title + ' Downloaded.')
+
+def signal_handler(signal, frame):
+	"""
+	handle keyboardinterrupt
+	"""
+	files = os.listdir()
+	for f in files:
+		if not os.path.isdir(f) and ".tmp" in f:
+			os.remove(f)
+
+	print('')
+	print('Good bye!')
+	sys.exit(0)
 
 if __name__ == "__main__":
-    main()
+	signal.signal(signal.SIGINT, signal_handler)
+	main()