None or [None] ?  How come it can be None or a list ? This smells bad