Gateways nearly done, added sandstone gateways