Command API 2

This update should finish the api to be ready for use