diff --git a/rtv/main.py b/rtv/main.py
new file mode 100644
index 0000000..4116a5a
--- /dev/null
+++ b/rtv/main.py
@@ -0,0 +1,28 @@
+import argparse
+import praw
+from utils import curses_session
+from content_generators import SubredditContent
+from subreddit_viewer import SubredditViewer
+
+parser = argparse.ArgumentParser(description='Reddit Terminal Viewer (RTV)')
+parser.add_argument('-u', '--username', help='reddit username')
+parser.add_argument('-p', '--password', help='reddit password')
+parser.add_argument('-s', '--subreddit', default='front', help='subreddit name')
+parser.add_argument('-l', '--link', help='full link to a specific submission')
+
+def main(args):
+
+    r = praw.Reddit(user_agent='reddit terminal viewer (rtv) v0.0')
+    if args.username and args.password:
+        r.login(args.username, args.password)
+
+    with curses_session() as stdscr:
+
+        content = SubredditContent(r, subreddit=args.subreddit)
+        viewer = SubredditViewer(stdscr, content)
+        viewer.loop()
+
+if __name__ == '__main__':
+
+    args = parser.parse_args()
+    main(args)
\ No newline at end of file
diff --git a/rtv/subreddit_viewer.py b/rtv/subreddit_viewer.py
index c134e2b..9571bcf 100644
--- a/rtv/subreddit_viewer.py
+++ b/rtv/subreddit_viewer.py
@@ -114,16 +114,4 @@ class SubredditViewer(BaseViewer):
 
         row = n_title + offset + 2
         if row in valid_rows:
-            win.addnstr(row, 1, '{author} {subreddit}'.format(**data), n_cols)
-
-def main():
-
-    with curses_session() as stdscr:
-        r = praw.Reddit(user_agent='reddit terminal viewer (rtv) v0.0')
-        generator = SubredditContent(r)
-        viewer = SubredditViewer(stdscr, generator)
-        viewer.loop()
-
-if __name__ == '__main__':
-
-    main()
+            win.addnstr(row, 1, '{author} {subreddit}'.format(**data), n_cols)
\ No newline at end of file