Initial pass at shim support #1