Fixed a bug in the solution...thanks to silverknight who alerted me!
To silverknight: Been a long while, welcome back!