I don't think it's a good idea to make a will anywhere and tell your darling what you've done. If you do such a thing you're more valuable dead than alive.
Let it be a post-mortem surprise for him while you enter heaven above.