Yes! Sounds like you have it figured out!