Gateway

Some things redesigned.