Continued work on API