Make it work again
Add documentation