Towards a working version..