Decided to refactor to include the multiwidth changes