Implement most of the remaining changes Roy recommended