Drastic changes. Simplier API.