TODOs, adapted to newest libs, use this where possible