I've added a note to the code -- I agree, this is going to need more thought.