Working towards a working version