Part 1 done of the gateway