Started working on API part