wip
clean up
wip API
API
Merge pull request #11 from ENEYSolutions/development

Development