Made corrections to focus on models.py
removed code that didn't belong
removed unecessary code
made small correction to ordering
made small correction to ordering
fixed merge file that I messed up