Initial files
Integrate with sample code
Fixes