[Shim] Initial commit