First working version
Merge https://github.com/maartenderks/research-b