Sounds like you're just about there. Enjoy!