Changed a lot of stuff in the Model around to prepare for class downloading.