New api

Merging new API as 1.0.0-dev until all tests are fixed