Right-sizing how bad this was