I think I'd need to renumber 08+ then.  I agree pretty much on the rest.