Steps towards a working version.