Work in progress: First working version