Api object will be really sweet. Restructuring of the Eta object. Preparing for caching.