We should really make an issue to parametrize things and address the TODOs.