diff --git a/requirements.txt b/requirements.txt
index 9d4bbed9..56555fc6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ pytz==2021.1
 topggpy
 psutil
 pillow
+python-dateutil
diff --git a/src/gui b/src/gui
index 2beff63d..ba4733a5 160000
--- a/src/gui
+++ b/src/gui
@@ -1 +1 @@
-Subproject commit 2beff63ddc42685f7ec153c6eb5adf536428da4c
+Subproject commit ba4733a5f02a98807c84f5202f293f408fdd8d60
diff --git a/src/modules/pending-rewrite/study/timers/Timer.py b/src/modules/pending-rewrite/study/timers/Timer.py
index 20a60c70..aff69729 100644
--- a/src/modules/pending-rewrite/study/timers/Timer.py
+++ b/src/modules/pending-rewrite/study/timers/Timer.py
@@ -267,14 +267,10 @@ class Timer:
                     await self._voice_update_task
                 except asyncio.CancelledError:
                     return
-        self._voice_update_task = asyncio.create_task(
+        self._last_voice_update = utc_now()
+        await asyncio.create_task(
             self.channel.edit(name=self.channel_name)
         )
-        try:
-            await self._voice_update_task
-            self._last_voice_update = utc_now()
-        except asyncio.CancelledError:
-            return
 
     async def status(self):
         """
diff --git a/src/modules/ranks/cog.py b/src/modules/ranks/cog.py
index 6c0f6dbc..958a15b4 100644
--- a/src/modules/ranks/cog.py
+++ b/src/modules/ranks/cog.py
@@ -416,7 +416,9 @@ class RankCog(LionCog):
                     # TODO: Temporary measure
                     season_start = lguild.config.get('season_start').value or datetime(1970, 1, 1)
                     stat_data = self.bot.get_cog('StatsCog').data
-                    session_rank.stat = (await stat_data.study_times_since(guildid, userid, season_start))[0]
+                    session_rank.stat = (await stat_data.VoiceSessionStat.study_times_since(
+                        guildid, userid, season_start)
+                    )[0]
                     # session_rank.stat += duration if (rank_type is RankType.VOICE) else guild_xp
                 else:
                     session_rank = await self.get_member_rank(guildid, userid)
diff --git a/src/modules/statistics/ui/weeklymonthly.py b/src/modules/statistics/ui/weeklymonthly.py
index e4c8fdd7..71708379 100644
--- a/src/modules/statistics/ui/weeklymonthly.py
+++ b/src/modules/statistics/ui/weeklymonthly.py
@@ -569,6 +569,10 @@ class WeeklyMonthlyUI(StatsUI):
 
             if page_type.stat is StatType.VOICE:
                 model = self.data.VoiceSessionStats
+            elif page_type.stat is StatType.TEXT:
+                model = self.bot.get_cog('TextTrackerCog').data.TextSessions
+            else:
+                model = self.data.VoiceSessionStats
 
             first_result = await model.table.select_one_where(**data_key).order_by('start_time')
             if first_result is None:
diff --git a/src/modules/test/__init__.py b/src/modules/test/__init__.py
index 326c9536..0e275185 100644
--- a/src/modules/test/__init__.py
+++ b/src/modules/test/__init__.py
@@ -1,9 +1,9 @@
 
 
 async def setup(bot):
-    # from .test import TestCog
+    from .test import TestCog
     # from .data import test_data
 
     # bot.db.load_registry(test_data)
-    # await bot.add_cog(TestCog(bot))
+    await bot.add_cog(TestCog(bot))
     pass