would be cool to solve this TODO before merging