Started working on Gateway