Implemenetd most of Task 2.3, Details view needs doing still.