Acknowledgements
Removed TODOs