Threw out several ws functions.
Before adding the settings bundle.