Added helpful details and TODO list