First release of entirely object-driven version