Updated to use theme object
Moving to use Collections
Getting new model to work
Collection model is working - enough to move on for now