Kracoeus-7002

Merged from mrudulpolus/KRACOEUS-7002.  Not fully functional.  Known issues are described in KRACOEUS-7745.  
Not a huge fan of this. There should be a better way to determine which type of site is being added.