Time to rebuild, I guess. It's ok since I wanted to re-organize anyway, and leave some out. More to come as I figure it out.