Aleks branch

- refactoring api