New TODO entry
Add leak tests

Hint: exporting functions currently leaks