This should be done when API for 1.0 is complete
This should be done when API for 1.0 is complete