Adding main.py stuff back into main.py