add TODO comtent, needs debuggoing later