it now sort of works very slowly
Merge branch 'master' into swingStuff