Made first go at a view.... untested