First pass of adding require