Smartend the intent API
Densify some of the lists
Drop the wrapper class for now