[WIP] — Initial move away from the skiplist.