-Add Sound api
-Cleanup