Some more changes. No luck
Added 'listing' functionality
Trying to get Terms to pretty print. For better debugging info.