I gang

Implement Api and fix bugs