Added in views for Issue #40 & #41