Niagara Class Build (Part 2)