Add more comments and TODO