.
Completed part B
Fixes to view
Changes for part 2
Fixing bugs for part 2
Fixes for part 2