Needs stress testing and other gateway updates. See #319