Add first series of overflow checks to see what happens.