added cli bootstrap
api rework
api rework