Beginning of (tedious) work separating localisation from main code