Development

Merging first draft of api into master