add TODO and base structure