Beginning work on new API and new demo.