yeah sounds good - I'll do that now, I think we need test files for all the conditionals