pretty massive type rearangements, more progress on filling out article-view