revamped model ralationships, and some views to match. sime landing page tests too.