Dev to Master, First try

Wrapper class and demo module.