Added comments and provided TODO context