adding TODO comments. removing EminentDomain code