Start transitioning to more dynamic width handling