Aborted experiment, optimisation.
Merge branch 'master' of github.com:wi77/LS2