I emailed the OP (Therese) and she began a new job and is very busy right now. I have offered to take over the swap if no one has any objections. I have gone through the thread and have made all the changes. Please let me know if something with your dates aren't quite right.
Lisa
Thanks for keeping it going!