started blocking out main logic
fixed merge conflicts in app.py