Moving towards new items/view setup. Refs #29