Dev to Master

Stubbed out solution template