Continued work on first pass roxygenizing