Simple api

Merging the "Simple API" back into master