Added object orientation to master.py