Initial work to prep for API generation
Merge pull request #1 from Marquis42/master

Initial work to prep for API generation