Cleaned everything up, added extension for handling the domain / subdomain items