1 files changed, 17 insertions, 2 deletions

diff --git a/kronos/parser.py b/kronos/parser.py
index b18b4f9..8d93391 100644
--- a/kronos/parser.py
+++ b/kronos/parser.py
@@ -13,19 +13,34 @@ class Activity(object):
         self.activity = activity
         self.description = description
         self.category = category
+        self.tags = []
 
 
 def parse_activity(text):
     description = None
+    tags = []
     if ',' in text:
         text, description = text.split(',', 1)
         description = description.strip()
 
+        tokens = description.split(' ')
+        tags = parse_tags(tokens)
+        description = strip_tags(tokens)
+
     category = None
     if '@' in text:
         text, category = text.split('@', 1)
         category = category.strip()
 
-    activity = text.strip()
+    activity = Activity(text.strip(), description, category)
+    activity.tags = tags
+
+    return activity
+
+
+def parse_tags(tokens):
+    return [token.lstrip('#') for token in tokens if token.startswith('#')]
+
 
-    return Activity(activity, description, category)
+def strip_tags(tokens):
+    return ' '.join([token for token in tokens if not token.startswith('#')])