I'm going back through it instead of re-writing and it's working out well. Thanks so much for the advice and saving me from another re-write!