As mentioned in a discussion we had yesterday, I don't like that we introduce this dependency between panels and windows, although I'd be fine with you submitting followup task to remove direct dependency in a future.