diff --git a/database.py b/database.py
index 799232a..8de9238 100644
--- a/database.py
+++ b/database.py
@@ -1,8 +1,10 @@
-from peewee import DateTimeField, ForeignKeyField, Model, CharField, BigIntegerField, DateField, TimestampField
+from peewee import DateTimeField, ForeignKeyField, Model, CharField, BigIntegerField, DateField
 from playhouse.db_url import connect
 
-from datetime import date, datetime, timedelta
+from datetime import date, datetime
 from config import db_url 
+
+
 db = connect(db_url)
 
 class WebUser(Model):
@@ -30,8 +32,7 @@ class Member(Model):
         database = db
 
 class Message(Model):
-    user_id   = BigIntegerField()
-    first_name = CharField()
+    user = ForeignKeyField(Member,lazy_load=True)
     timestamp = DateTimeField(default=datetime.now()) 
          
     class Meta: