diff --git a/fediplay/cli.py b/fediplay/cli.py
index a704aa2..3a0d238 100644
--- a/fediplay/cli.py
+++ b/fediplay/cli.py
@@ -1,5 +1,7 @@
 '''Entry point for command-line interface.'''
 
+options = {'debug': False}
+
 import os
 path = os.path
 import sys
@@ -49,9 +51,12 @@ def get_client_credentials(instance):
     )
 
 @click.group()
-def cli():
+@click.option('-d', '--debug', is_flag=True, help='Print debug messages.')
+def cli(debug):
     '''A program to play music your friends post on Mastodon.'''
 
+    options['debug'] = debug
+
     ensure_dirs()
 
 @cli.command()
@@ -79,10 +84,11 @@ def login(instance):
 
 @cli.command()
 @click.argument('instance')
-def stream(instance):
+@click.argument('users', nargs=-1)
+def stream(instance, users):
     '''Stream music from your timeline.'''
 
     client_id, client_secret = get_client_credentials(instance)
     access_token = get_access_token(instance)
 
-    mastodon.stream(instance, client_id, client_secret, access_token, cache_dir=DIRS.user_cache_dir)
+    mastodon.stream(instance, users, client_id, client_secret, access_token, cache_dir=DIRS.user_cache_dir)
diff --git a/fediplay/mastodon.py b/fediplay/mastodon.py
index 2347ec1..20a3e3e 100644
--- a/fediplay/mastodon.py
+++ b/fediplay/mastodon.py
@@ -7,6 +7,7 @@ from lxml.etree import HTML # pylint: disable=no-name-in-module
 import mastodon
 from youtube_dl.utils import DownloadError
 
+from fediplay.cli import options
 import fediplay.keyring as keyring
 from fediplay.queue import Queue
 
@@ -21,10 +22,24 @@ def api_base_url(instance):
 class StreamListener(mastodon.StreamListener):
     '''Listens to a Mastodon timeline and adds links the given Queue.'''
 
-    def __init__(self, queue):
+    def __init__(self, queue, instance, users):
         self.queue = queue
+        self.instance = instance
+        self.users = users
+
+        if options['debug']:
+            print('listener initialized with users={}'.format(self.users))
 
     def on_update(self, status):
+        if options['debug']:
+            print('status: {}'.format(repr(status)))
+            print('incoming toot: username={}'.format(status.account.acct))
+
+        if self.users and normalize_username(status.account.acct, self.instance) not in self.users:
+            if options['debug']:
+                print('skipping toot due to username filtering')
+            return
+
         tags = extract_tags(status)
         if 'fediplay' in tags:
             links = extract_links(status)
@@ -61,11 +76,12 @@ def login(instance, client_id, client_secret, grant_code):
     access_token = client.log_in(code=grant_code, scopes=['read'])
     keyring.set_credential(instance, keyring.CREDENTIAL_ACCESS_TOKEN, access_token)
 
-def stream(instance, client_id, client_secret, access_token, cache_dir='.'):
+def stream(instance, users, client_id, client_secret, access_token, cache_dir='.'):
     '''Stream statuses and add them to a queue.'''
 
     client = build_client(instance, client_id, client_secret, access_token)
-    listener = StreamListener(Queue(cache_dir))
+    users = [normalize_username(user, instance) for user in users]
+    listener = StreamListener(Queue(cache_dir), instance, users)
     click.echo('==> Streaming from {}'.format(instance))
     client.stream_user(listener)
 
@@ -74,6 +90,17 @@ def extract_tags(toot):
 
     return [tag['name'] for tag in toot['tags']]
 
+def normalize_username(user, instance):
+    user = user.lstrip('@')
+    parts = user.split('@')
+    if options['debug']:
+        print('parts: {}'.format(repr(parts)))
+
+    if len(parts) == 1 or parts[1] == instance:
+        return parts[0]
+    else:
+        return user
+
 def link_is_internal(link):
     '''Determines if a link is internal to the Mastodon instance.'''
 
diff --git a/fediplay/queue.py b/fediplay/queue.py
index ffc5d06..0417715 100644
--- a/fediplay/queue.py
+++ b/fediplay/queue.py
@@ -8,6 +8,7 @@ from threading import Thread, Lock
 import click
 from youtube_dl import YoutubeDL, utils
 
+from fediplay.cli import options
 import fediplay.env as env
 
 
@@ -62,7 +63,13 @@ class Getter(object):
         self.cache_dir = cache_dir
 
     def _progress_hook(self, progress):
-        if progress['status'] == 'downloading' and progress['filename'] not in self.filenames:
+        if options['debug']:
+            print('progress hook: status {}, filename {}'.format(
+                repr(progress['status']), repr(progress['filename'])
+            ))
+
+        if (progress['status'] in ('downloading', 'finished') and 
+            progress['filename'] not in self.filenames):
             self.filenames.append(progress['filename'])
 
     def get(self, url):