Documentation and TO-DO note