[wip] Implementing shims