Model edit

Restructuring the view data to include logs/comments.

Categorize was broken with this change, but is mostly fixed now.