Added TODOs and descriptions.