Added TODOs and recommendations.