Rework of model in Python, starting 9/16/2013