I'll cover all these cases with testing, it's slowing coming in :-). Thanks for code reviewing btw.