Added comments and TODO items