Add in the gate collection
Sort at the end till I can remove it.