Lots of model refactoring, switching from arrays to lists.