First working version with draft inline comments