Pass at #7, should be fairly straightforward