Integration 

Pulling Integration of stubs into master so there is a solid base to work on