Updated Gateway Extenstions and Implementations

Alex can you check to make sure I'm on the right track with these