First passing shims
More improvements