Basic API Work Done
Merging Basic API Work