Looks close to what I have done. You are on the right path.