Sdk2

Merging SDK2 stuff into master branch