Began work on numerous changes to API
Big API changes
Merge branch 'v0.3.0'