More additions to main.py