Shardig strategy FIxes #504

Please pull me in