Add TODO
Remove functions that return results in degree