Moved SiteId to a static define
Moved Brandon's section to the new api
Cleaned/formatted code