Implemented Shim+Valve including Tests