I think it's worth fixing the design before merging this because it'll be much easier to maintain.