beefed up models to eliminate querying in views