Removed TODO and NOTES due to the fact that they were turned into issues.