Cleanup code to meet C++ standards
Add class stubs
Merge pull request #16 from Isaac-W/master

Fixups and stub code