Continued work on API
Continued work on API