Nearly complete on the widths rework

Signed-off-by: shaunkrd <shaunkrd@gmail.com>