Major cleanup, being more generic with concept of site instead of topic.