Not perfect, need to break up the types, and break up a few more things but we now have per site modules