Huge over-haul to my Locale system