normalise
massive sweeping changes