more model edits, beginning work on views