If nobody else is on this by Monday, I can do this. This and nsecbunker redesign go well together 😉.