Make the model a list of Sqaures, instead of a list of objects.

Pair programming with jals
Merge remote-tracking branch 'origin/master'