Added in skip (WIP)