Partial functionality added to main.py