Catch a is a fabulous experience and I can't see anyone having the need to leave the property for too long!
I'd stay with the original plan.
And satp is fabulous choice.