Added TODOs and success check.