diff --git a/app.py b/app.py
index 743d4ed..f4b304a 100644
--- a/app.py
+++ b/app.py
@@ -4,8 +4,9 @@ import os
 from sqlalchemy import case
 
 from auth import login_required, bp as auth_bp
-from deck import get_deck, bp as deck_bp
-from flask import Flask, render_template, session, request
+from deck import probabilistic_deck_generator, bp as deck_bp
+from menu import bp as menu_bp
+from flask import Flask, redirect, render_template, session, request, url_for
 
 from create_db import Card
 from sqlalchemy import create_engine
@@ -56,33 +57,32 @@ def create_app(test_config=None):
             global deck_index
             user_id = session['user_id']
             username = session['username']
-            d = get_deck(user_id)
+            d = probabilistic_deck_generator(user_id, 5, 5) #to je hell ker vsakič generira nov deck TODO deck bi moral bit nekako stabilen
             
             deck_index+=1
             if deck_index < len(d):
                 card = d[deck_index]
             else:
                 deck_index =-1
-                return end_of_session()
+                return redirect(url_for("menu.index"))
 
-            #for card in d: #TODO to ne dela, nevem kako renderat zapooredno kartic
             if request.method == 'POST':
                 rate = request.form['rate']
                 cardtitle = request
                 print(rate)
                 if rate == "Yes":
                     k = 1
+                    dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': 1})
                 elif rate == "Maybe":
                     k = 0.5
+                    dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1
                 elif rate == "No":
                     k = 0.1
-
+                    dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1
     
                 print(card.id)
                 print(user_id)
-                dbsession.query(Card).filter(Card.id == card.id).update({'interest_rate': abs(card.interest_rate*k)}) #TODO 1 mora nastavit na 1
                 dbsession.commit()  
-                #render_template("deck/index.html", username=username, card = card)
             return render_template("deck/index.html", username=username, card = card) # no idea kaj se tu dogaja...
         else:
             return index()
@@ -93,27 +93,20 @@ def create_app(test_config=None):
         session.pop("user_id", None)
         return index()
 
-    @app.route('/end')
-    def end_of_session():
-        return "end"
-
-    
-    @app.route('/menu')
-    def end_of_session():
-        return "menu"
 
     @app.route('/match')
-    def end_of_session():
+    def match():
         return "match"
 
     @app.route('/upload')
-    def end_of_session():
+    def upload():
         return "upload"
     
     
     #app.register_blueprint(bp) # ??
     app.register_blueprint(auth_bp)
     app.register_blueprint(deck_bp)
+    app.register_blueprint(menu_bp)
     app.add_url_rule('/', endpoint='index')
 
     return app