Comitting the work of the last few days

- Work on completing the API, perhaps redesign of the API incoming