Work on supporting razor. #33