Prep for razor support. #33