added entities.  Need to convert the config reading to YAML