Sweet! That seemed to work. The new code is a lot cleaner, but still could use some work.