Flexibility

Added more of the config to json to allow for flexibility