new and improved view (still incomplete)