Basic API implementation for web service
Cleanup and stuff
Additional features