All files consolidated into models.py and views.py, 7/30/13 600pm