Dedicated the day to finishing this part of the project. Wildcat fits and should be room for the Riv. Next on the list is the new mess I've created out back.