First commit with initial changes to main.py