Much better architecture for dealing with what's available. Some more 
work on detail view.