I wouldn't mind the two sharing a bungalow. Maybe there's a computer error or filing error and they end up in the same bungalow because of it? If that happens Koga could walk in on the group and it would give you a chance to have him get into the middle of things.