I think this is fine - if we get confused, we can always split it up later.