more model view stuff added