API complete
Merge pull request #1 from buckleys78/api_dev

API complete