Started working on integration part