New changes plus a working app. main-new.py is working