Ugh, should have linkted and checkd indenting before sending. Here is an update.